diff --git a/misc/testing/DB/convert_to_tpg.php b/misc/testing/DB/convert_to_tpg.php index ea29f573c..386cf4d61 100644 --- a/misc/testing/DB/convert_to_tpg.php +++ b/misc/testing/DB/convert_to_tpg.php @@ -62,9 +62,9 @@ while ($cdone < $clen['total']) { if ($debug) { echo "\n\nCollection insert:\n"; print_r($collection); - echo sprintf("\nINSERT INTO collections_%d (subject, fromname, date, xref, totalfiles, group_id, collectionhash, dateadded, filecheck, filesize, releaseid) VALUES (%s)\n\n", $collection['group_id'], implode(', ', $collection)); + echo sprintf("\nINSERT INTO collections_%d (subject, fromname, date, xref, totalfiles, groups_id, collectionhash, dateadded, filecheck, filesize, releaseid) VALUES (%s)\n\n", $collection['groups_id'], implode(', ', $collection)); } - $newcid = array('collection_id' => $pdo->queryInsert(sprintf('INSERT INTO collections_%d (subject, fromname, date, xref, totalfiles, group_id, collectionhash, dateadded, filecheck, filesize, releaseid) VALUES (%s);', $collection['group_id'], implode(', ', $collection)))); + $newcid = array('collection_id' => $pdo->queryInsert(sprintf('INSERT INTO collections_%d (subject, fromname, date, xref, totalfiles, groups_id, collectionhash, dateadded, filecheck, filesize, releaseid) VALUES (%s);', $collection['groups_id'], implode(', ', $collection)))); $consoletools->overWrite('Collections Completed: ' . $consoletools->percentString($ccount, $clen['total'])); //Get binaries and split to correct group tables. @@ -79,9 +79,9 @@ while ($cdone < $clen['total']) { if ($debug) { echo "\n\nBinary insert:\n"; print_r($binarynew); - echo sprintf("\nINSERT INTO binaries_%d (name, collection_id, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize) VALUES (%s)\n\n", $collection['group_id'], implode(', ', $binarynew)); + echo sprintf("\nINSERT INTO binaries_%d (name, collection_id, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize) VALUES (%s)\n\n", $collection['groups_id'], implode(', ', $binarynew)); } - $newbid = array('binaryid' => $pdo->queryInsert(sprintf('INSERT INTO binaries_%d (name, collection_id, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize) VALUES (%s);', $collection['group_id'], implode(', ', $binarynew)))); + $newbid = array('binaryid' => $pdo->queryInsert(sprintf('INSERT INTO binaries_%d (name, collection_id, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize) VALUES (%s);', $collection['groups_id'], implode(', ', $binarynew)))); //Get parts and split to correct group tables. $parts = $pdo->queryAssoc('SELECT * FROM parts WHERE binaryID = ' . $oldbid . ';'); @@ -97,9 +97,9 @@ while ($cdone < $clen['total']) { $partsnew = substr($partsnew, 0, -2); if ($debug) { echo "\n\nParts insert:\n"; - echo sprintf("\nINSERT INTO parts_%d (binaryid, messageid, number, partnumber, size, collection_id) VALUES %s;\n\n", $collection['group_id'], $partsnew); + echo sprintf("\nINSERT INTO parts_%d (binaryid, messageid, number, partnumber, size, collection_id) VALUES %s;\n\n", $collection['groups_id'], $partsnew); } - $sql = sprintf('INSERT INTO parts_%d (binaryid, messageid, number, partnumber, size, collection_id) VALUES %s;', $collection['group_id'], $partsnew); + $sql = sprintf('INSERT INTO parts_%d (binaryid, messageid, number, partnumber, size, collection_id) VALUES %s;', $collection['groups_id'], $partsnew); $pdo->queryExec($sql); } } @@ -114,22 +114,22 @@ if ($DoPartRepair === true) { foreach ($actgroups as $group) { $pcount = 1; $pdone = 0; - $sql = sprintf('SELECT COUNT(*) AS total FROM missed_parts where group_id = %d;', $group['id']); + $sql = sprintf('SELECT COUNT(*) AS total FROM missed_parts where groups_id = %d;', $group['id']); $plen = $pdo->queryOneRow($sql); while ($pdone < $plen['total']) { // Only load 10000 partrepair records per loop to not overload memory. - $partrepairs = $pdo->queryAssoc(sprintf('select * from missed_parts where group_id = %d limit %d, 10000;', $group['id'], $pdone)); + $partrepairs = $pdo->queryAssoc(sprintf('select * from missed_parts where groups_id = %d limit %d, 10000;', $group['id'], $pdone)); if ($partrepairs instanceof \Traversable) { foreach ($partrepairs as $partrepair) { $partrepair['numberid'] = $pdo->escapeString($partrepair['numberid']); - $partrepair['group_id'] = $pdo->escapeString($partrepair['group_id']); + $partrepair['groups_id'] = $pdo->escapeString($partrepair['groups_id']); $partrepair['attempts'] = $pdo->escapeString($partrepair['attempts']); if ($debug) { echo "\n\nPart Repair insert:\n"; print_r($partrepair); - echo sprintf("\nINSERT INTO partrepair_%d (numberid, group_id, attempts) VALUES (%s, %s, %s)\n\n", $group['id'], $partrepair['numberid'], $partrepair['group_id'], $partrepair['attempts']); + echo sprintf("\nINSERT INTO partrepair_%d (numberid, groups_id, attempts) VALUES (%s, %s, %s)\n\n", $group['id'], $partrepair['numberid'], $partrepair['groups_id'], $partrepair['attempts']); } - $pdo->queryExec(sprintf('INSERT INTO partrepair_%d (numberid, group_id, attempts) VALUES (%s, %s, %s);', $group['id'], $partrepair['numberid'], $partrepair['group_id'], $partrepair['attempts'])); + $pdo->queryExec(sprintf('INSERT INTO partrepair_%d (numberid, groups_id, attempts) VALUES (%s, %s, %s);', $group['id'], $partrepair['numberid'], $partrepair['groups_id'], $partrepair['attempts'])); $consoletools->overWrite('Part Repairs Completed for ' . $group['name'] . ':' . $consoletools->percentString($pcount, $plen['total'])); $pcount++; } diff --git a/misc/testing/DB/convert_to_tpg_alt.php b/misc/testing/DB/convert_to_tpg_alt.php index af81e08e1..c3f036f95 100644 --- a/misc/testing/DB/convert_to_tpg_alt.php +++ b/misc/testing/DB/convert_to_tpg_alt.php @@ -18,20 +18,20 @@ $start = time(); $consoleTools = new ConsoleTools(['ColorCLI' => $pdo->log]); $groups = new Groups(['Settings' => $pdo]); -$actgroups = $pdo->query("SELECT DISTINCT group_id from collections"); +$actgroups = $pdo->query("SELECT DISTINCT groups_id from collections"); echo $pdo->log->info("Creating new collections, binaries, and parts tables for each group that has collections."); foreach ($actgroups as $group) { - $pdo->queryExec("DROP TABLE IF EXISTS collections_" . $group['group_id']); - $pdo->queryExec("DROP TABLE IF EXISTS binaries_" . $group['group_id']); - $pdo->queryExec("DROP TABLE IF EXISTS parts_" . $group['group_id']); - if ($groups->createNewTPGTables($group['group_id']) === false) { + $pdo->queryExec("DROP TABLE IF EXISTS collections_" . $group['groups_id']); + $pdo->queryExec("DROP TABLE IF EXISTS binaries_" . $group['groups_id']); + $pdo->queryExec("DROP TABLE IF EXISTS parts_" . $group['groups_id']); + if ($groups->createNewTPGTables($group['groups_id']) === false) { exit($pdo->log->error("\nThere is a problem creating new parts/files tables for group ${group['name']}.\n")); } } -$collections_rows = $pdo->queryDirect("SELECT group_id FROM collections GROUP BY group_id"); +$collections_rows = $pdo->queryDirect("SELECT groups_id FROM collections GROUP BY groups_id"); echo $pdo->log->info("Counting parts, this could take a few minutes."); $parts_count = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts"); @@ -39,32 +39,32 @@ $parts_count = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts"); $i = 0; if ($collections_rows instanceof \Traversable) { foreach ($collections_rows as $row) { - $groupName = $groups->getNameByID($row['group_id']); + $groupName = $groups->getNameByID($row['groups_id']); echo $pdo->log->header("Processing ${groupName}"); //collection - $pdo->queryExec("INSERT IGNORE INTO collections_" . $row['group_id'] . " (subject, fromname, date, xref, totalfiles, group_id, collectionhash, dateadded, filecheck, filesize, releaseid) " - . "SELECT subject, fromname, date, xref, totalfiles, group_id, collectionhash, dateadded, filecheck, filesize, releaseid FROM collections WHERE group_id = ${row['group_id']}"); - $collections = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM collections where group_id = " . $row['group_id']); - $ncollections = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM collections_" . $row['group_id']); + $pdo->queryExec("INSERT IGNORE INTO collections_" . $row['groups_id'] . " (subject, fromname, date, xref, totalfiles, groups_id, collectionhash, dateadded, filecheck, filesize, releaseid) " + . "SELECT subject, fromname, date, xref, totalfiles, groups_id, collectionhash, dateadded, filecheck, filesize, releaseid FROM collections WHERE groups_id = ${row['groups_id']}"); + $collections = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM collections where groups_id = " . $row['groups_id']); + $ncollections = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM collections_" . $row['groups_id']); echo $pdo->log->primary("Group ${groupName}, Collections = ${collections['cnt']} [${ncollections['cnt']}]"); //binaries - $pdo->queryExec("INSERT IGNORE INTO binaries_${row['group_id']} (name, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize, collection_id) " + $pdo->queryExec("INSERT IGNORE INTO binaries_${row['groups_id']} (name, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize, collection_id) " . "SELECT name, filenumber, totalparts, currentparts, binaryhash, partcheck, partsize, n.id FROM binaries b " . "INNER JOIN collections c ON b.collection_id = c.id " - . "INNER JOIN collections_${row['group_id']} n ON c.collectionhash = n.collectionhash AND c.group_id = ${row['group_id']}"); - $binaries = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM binaries b INNER JOIN collections c ON b.collection_id = c.id where c.group_id = ${row['group_id']}"); - $nbinaries = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM binaries_${row['group_id']}"); + . "INNER JOIN collections_${row['groups_id']} n ON c.collectionhash = n.collectionhash AND c.groups_id = ${row['groups_id']}"); + $binaries = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM binaries b INNER JOIN collections c ON b.collection_id = c.id where c.groups_id = ${row['groups_id']}"); + $nbinaries = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM binaries_${row['groups_id']}"); echo $pdo->log->primary("Group ${groupName}, Binaries = ${binaries['cnt']} [${nbinaries['cnt']}]"); //parts - $pdo->queryExec("INSERT IGNORE INTO parts_${row['group_id']} (messageid, number, partnumber, size, binaryid, collection_id) " + $pdo->queryExec("INSERT IGNORE INTO parts_${row['groups_id']} (messageid, number, partnumber, size, binaryid, collection_id) " . "SELECT messageid, number, partnumber, size, n.id, c.id FROM parts p " . "INNER JOIN binaries b ON p.binaryid = b.id " - . "INNER JOIN binaries_${row['group_id']} n ON b.binaryhash = n.binaryhash " - . "INNER JOIN collections_${row['group_id']} c on c.id = n.collection_id AND c.group_id = ${row['group_id']}"); - $parts = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts p INNER JOIN binaries b ON p.binaryid = b.id INNER JOIN collections c ON b.collection_id = c.id WHERE c.group_id = ${row['group_id']}"); - $nparts = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts_${row['group_id']}"); + . "INNER JOIN binaries_${row['groups_id']} n ON b.binaryhash = n.binaryhash " + . "INNER JOIN collections_${row['groups_id']} c on c.id = n.collection_id AND c.groups_id = ${row['groups_id']}"); + $parts = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts p INNER JOIN binaries b ON p.binaryid = b.id INNER JOIN collections c ON b.collection_id = c.id WHERE c.groups_id = ${row['groups_id']}"); + $nparts = $pdo->queryOneRow("SELECT COUNT(*) AS cnt FROM parts_${row['groups_id']}"); echo $pdo->log->primary("Group ${groupName}, Parts = ${parts['cnt']} [${nparts['cnt']}]\n"); $i++; } diff --git a/misc/update/python/fixreleasenames_threaded.py b/misc/update/python/fixreleasenames_threaded.py index 51833f7d7..add8a07fd 100644 --- a/misc/update/python/fixreleasenames_threaded.py +++ b/misc/update/python/fixreleasenames_threaded.py @@ -74,7 +74,7 @@ elif len(sys.argv) > 1 and (sys.argv[1] == "md5"): datas = cur[0].fetchall() elif len(sys.argv) > 1 and (sys.argv[1] == "par2"): #This one does from oldest posts to newest posts, since nfo pp does same thing but newest to oldest - run = "SELECT id AS releaseid, guid, group_id FROM releases WHERE nzbstatus = 1 AND proc_par2 = 0 AND" + clean + "ORDER BY postdate ASC LIMIT %s" + run = "SELECT id AS releaseid, guid, groups_id FROM releases WHERE nzbstatus = 1 AND proc_par2 = 0 AND" + clean + "ORDER BY postdate ASC LIMIT %s" cur[0].execute(run, (int(perrun[0]) * int(run_threads[0]))) datas = cur[0].fetchall() elif len(sys.argv) > 1 and (sys.argv[1] == "predbft"): diff --git a/misc/update/python/postprocess_threaded.py b/misc/update/python/postprocess_threaded.py index 1865a0942..4cc78ea04 100644 --- a/misc/update/python/postprocess_threaded.py +++ b/misc/update/python/postprocess_threaded.py @@ -35,38 +35,38 @@ elif sys.argv[1] == "nfo": # You can limit postprocessing for additional and nfo by group_id or categories_id if len(sys.argv) == 3 and sys.argv[2].isdigit() and len(sys.argv[2]) < 4: - group_id = 'AND group_id = '+sys.argv[2] + group_id = 'AND groups_id = '+sys.argv[2] print(bcolors.HEADER + "Using group_id "+sys.argv[2] + bcolors.ENDC) elif len(sys.argv) == 3 and sys.argv[2].isdigit() and len(sys.argv[2]) == 4: if sys.argv[2] == '1000': - group_id = 'AND categories_id BETWEEN 1000 AND 1999' + groups_id = 'AND categories_id BETWEEN 1000 AND 1999' print(bcolors.HEADER + "Using categoryids 1000-1999" + bcolors.ENDC) elif sys.argv[2] == '2000': - group_id = 'AND categories_id BETWEEN 2000 AND 2999' + groups_id = 'AND categories_id BETWEEN 2000 AND 2999' print(bcolors.HEADER + "Using categoryids 2000-2999" + bcolors.ENDC) elif sys.argv[2] == '3000': - group_id = 'AND categories_id BETWEEN 3000 AND 3999' + groups_id = 'AND categories_id BETWEEN 3000 AND 3999' print(bcolors.HEADER + "Using categoryids 3000-3999" + bcolors.ENDC) elif sys.argv[2] == '4000': - group_id = 'AND categories_id BETWEEN 4000 AND 4999' + groups_id = 'AND categories_id BETWEEN 4000 AND 4999' print(bcolors.HEADER + "Using categoryids 4000-4999" + bcolors.ENDC) elif sys.argv[2] == '5000': - group_id = 'AND categories_id BETWEEN 5000 AND 5999' + groups_id = 'AND categories_id BETWEEN 5000 AND 5999' print(bcolors.HEADER + "Using categoryids 5000-5999" + bcolors.ENDC) elif sys.argv[2] == '6000': - group_id = 'AND categories_id BETWEEN 6000 AND 6999' + groups_id = 'AND categories_id BETWEEN 6000 AND 6999' print(bcolors.HEADER + "Using categoryids 6000-6999" + bcolors.ENDC) elif sys.argv[2] == '7000': - group_id = 'AND categories_id BETWEEN 7000 AND 7999' + groups_id = 'AND categories_id BETWEEN 7000 AND 7999' print(bcolors.HEADER + "Using categoryids 7000-7999" + bcolors.ENDC) elif sys.argv[2] == '0000': - group_id = 'AND categories_id BETWEEN 0000 AND 0999' + groups_id = 'AND categories_id BETWEEN 0000 AND 0999' print(bcolors.HEADER + "Using categoryids 0000-0999" + bcolors.ENDC) else: - group_id = 'AND categories_id = '+sys.argv[2] + groups_id = 'AND categories_id = '+sys.argv[2] print(bcolors.HEADER + "Using categories_id "+sys.argv[2] + bcolors.ENDC) else: - group_id = '' + groups_id = '' #you can sort tv releases by searchname if len(sys.argv) == 3 and (sys.argv[2] == "asc" or sys.argv[2] == "desc"): @@ -82,7 +82,7 @@ start_time = time.time() pathname = os.path.abspath(os.path.dirname(sys.argv[0])) if len(sys.argv) > 1 and sys.argv[1] == "additional": - cur[0].execute("SELECT (SELECT value FROM settings WHERE setting = 'postthreads') AS a, (SELECT value FROM settings WHERE setting = 'maxaddprocessed') AS b, (SELECT value FROM settings WHERE setting = 'maxnfoprocessed') AS c, (SELECT value FROM settings WHERE setting = 'maximdbprocessed') AS d, (SELECT value FROM settings WHERE setting = 'maxrageprocessed') AS e, (SELECT value FROM settings WHERE setting = 'maxsizetopostprocess') AS f, (SELECT value FROM settings WHERE setting = 'tmpunrarpath') AS g, (SELECT value FROM tmux WHERE setting = 'post') AS h, (SELECT value FROM tmux WHERE setting = 'post_non') AS i, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -1 "+group_id+") as j, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -2 "+group_id+") as k, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -3 "+group_id+") as l, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -4 "+group_id+") as m, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -5 "+group_id+") as n, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -6 "+group_id+") as o") + cur[0].execute("SELECT (SELECT value FROM settings WHERE setting = 'postthreads') AS a, (SELECT value FROM settings WHERE setting = 'maxaddprocessed') AS b, (SELECT value FROM settings WHERE setting = 'maxnfoprocessed') AS c, (SELECT value FROM settings WHERE setting = 'maximdbprocessed') AS d, (SELECT value FROM settings WHERE setting = 'maxrageprocessed') AS e, (SELECT value FROM settings WHERE setting = 'maxsizetopostprocess') AS f, (SELECT value FROM settings WHERE setting = 'tmpunrarpath') AS g, (SELECT value FROM tmux WHERE setting = 'post') AS h, (SELECT value FROM tmux WHERE setting = 'post_non') AS i, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -1 "+groups_id+") as j, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -2 "+groups_id+") as k, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -3 "+groups_id+") as l, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -4 "+groups_id+") as m, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -5 "+groups_id+") as n, (SELECT count(*) FROM releases WHERE haspreview = -1 and passwordstatus = -6 "+groups_id+") as o") dbgrab = cur[0].fetchall() ps1 = format(int(dbgrab[0][9])) ps2 = format(int(dbgrab[0][10])) @@ -91,7 +91,7 @@ if len(sys.argv) > 1 and sys.argv[1] == "additional": ps5 = format(int(dbgrab[0][13])) ps6 = format(int(dbgrab[0][14])) elif len(sys.argv) > 1 and sys.argv[1] == "nfo": - cur[0].execute("SELECT (SELECT value FROM settings WHERE setting = 'nfothreads') AS a, (SELECT value FROM settings WHERE setting = 'maxaddprocessed') AS b, (SELECT value FROM settings WHERE setting = 'maxnfoprocessed') AS c, (SELECT value FROM settings WHERE setting = 'maximdbprocessed') AS d, (SELECT value FROM settings WHERE setting = 'maxrageprocessed') AS e, (SELECT value FROM settings WHERE setting = 'maxsizetopostprocess') AS f, (SELECT value FROM settings WHERE setting = 'tmpunrarpath') AS g, (SELECT value FROM tmux WHERE setting = 'post') AS h, (SELECT value FROM tmux WHERE setting = 'post_non') AS i, (SELECT count(*) FROM releases WHERE nfostatus = -1 "+group_id+") as j, (SELECT count(*) FROM releases WHERE nfostatus = -2 "+group_id+") as k, (SELECT count(*) FROM releases WHERE nfostatus = -3 "+group_id+") as l, (SELECT count(*) FROM releases WHERE nfostatus = -4 "+group_id+") as m, (SELECT count(*) FROM releases WHERE nfostatus = -5 "+group_id+") as n, (SELECT count(*) FROM releases WHERE nfostatus = -6 "+group_id+") as o") + cur[0].execute("SELECT (SELECT value FROM settings WHERE setting = 'nfothreads') AS a, (SELECT value FROM settings WHERE setting = 'maxaddprocessed') AS b, (SELECT value FROM settings WHERE setting = 'maxnfoprocessed') AS c, (SELECT value FROM settings WHERE setting = 'maximdbprocessed') AS d, (SELECT value FROM settings WHERE setting = 'maxrageprocessed') AS e, (SELECT value FROM settings WHERE setting = 'maxsizetopostprocess') AS f, (SELECT value FROM settings WHERE setting = 'tmpunrarpath') AS g, (SELECT value FROM tmux WHERE setting = 'post') AS h, (SELECT value FROM tmux WHERE setting = 'post_non') AS i, (SELECT count(*) FROM releases WHERE nfostatus = -1 "+groups_id+") as j, (SELECT count(*) FROM releases WHERE nfostatus = -2 "+groups_id+") as k, (SELECT count(*) FROM releases WHERE nfostatus = -3 "+groups_id+") as l, (SELECT count(*) FROM releases WHERE nfostatus = -4 "+groups_id+") as m, (SELECT count(*) FROM releases WHERE nfostatus = -5 "+groups_id+") as n, (SELECT count(*) FROM releases WHERE nfostatus = -6 "+groups_id+") as o") dbgrab = cur[0].fetchall() ps1 = format(int(dbgrab[0][9])) ps2 = format(int(dbgrab[0][10])) diff --git a/misc/update/python/requestid_threaded.py b/misc/update/python/requestid_threaded.py index 5ac0c7a81..d5c76b678 100644 --- a/misc/update/python/requestid_threaded.py +++ b/misc/update/python/requestid_threaded.py @@ -35,7 +35,7 @@ print(bcolors.HEADER + "\n\nRequestID Threaded Started at {}".format(datetime.da cur[0].execute("SELECT value FROM settings WHERE setting = 'request_hours'") dbgrab = cur[0].fetchone() request_hours = str(dbgrab[0]) -cur[0].execute("SELECT DISTINCT(g.id) FROM releases r INNER JOIN groups g ON r.group_id = g.id WHERE r.nzbstatus = 1 AND r.predb_id = 0 AND r.isrequestid = 1 AND r.reqidstatus in (0, -1) OR (r.reqidstatus = -3 AND r.adddate > NOW() - INTERVAL " + request_hours + " HOUR)") +cur[0].execute("SELECT DISTINCT(g.id) FROM releases r INNER JOIN groups g ON r.groups_id = g.id WHERE r.nzbstatus = 1 AND r.predb_id = 0 AND r.isrequestid = 1 AND r.reqidstatus in (0, -1) OR (r.reqidstatus = -3 AND r.adddate > NOW() - INTERVAL " + request_hours + " HOUR)") datas = cur[0].fetchall() #close connection to mysql diff --git a/nntmux/Binaries.php b/nntmux/Binaries.php index ba371a180..2b8d2905d 100755 --- a/nntmux/Binaries.php +++ b/nntmux/Binaries.php @@ -548,7 +548,7 @@ class Binaries if ($partRepair === true) { $this->_pdo->queryExec( sprintf( - 'UPDATE missed_parts SET attempts = attempts + 1 WHERE group_id = %d AND numberid %s', + 'UPDATE missed_parts SET attempts = attempts + 1 WHERE groups_id = %d AND numberid %s', $groupMySQL['id'], ($first == $last ? '= ' . $first : 'IN (' . implode(',', range($first, $last)) . ')') ) @@ -756,7 +756,7 @@ class Binaries $unixtime = is_numeric($header['Date']) ? $date : $now; $collectionID = $this->_pdo->queryInsert( sprintf(" - INSERT INTO %s (subject, fromname, date, xref, group_id, + INSERT INTO %s (subject, fromname, date, xref, groups_id, totalfiles, collectionhash, dateadded) VALUES (%s, %s, FROM_UNIXTIME(%s), %s, %d, %d, '%s', NOW()) ON DUPLICATE KEY UPDATE %s dateadded = NOW(), noise = '%s'", @@ -1055,7 +1055,7 @@ class Binaries $missingParts = $this->_pdo->query( sprintf(' SELECT * FROM %s - WHERE group_id = %d AND attempts < %d + WHERE groups_id = %d AND attempts < %d ORDER BY numberid ASC LIMIT %d', $tableNames['prname'], $groupArr['id'], @@ -1122,7 +1122,7 @@ class Binaries sprintf(' SELECT COUNT(id) AS num FROM %s - WHERE group_id = %d + WHERE groups_id = %d AND numberid <= %d', $tableNames['prname'], $groupArr['id'], @@ -1141,7 +1141,7 @@ class Binaries sprintf(' UPDATE %s SET attempts = attempts + 1 - WHERE group_id = %d + WHERE groups_id = %d AND numberid <= %d', $tableNames['prname'], $groupArr['id'], @@ -1164,7 +1164,7 @@ class Binaries // Remove articles that we cant fetch after x attempts. $this->_pdo->queryExec( sprintf( - 'DELETE FROM %s WHERE attempts >= %d AND group_id = %d', + 'DELETE FROM %s WHERE attempts >= %d AND groups_id = %d', $tableNames['prname'], $this->_partRepairMaxTries, $groupArr['id'] @@ -1208,7 +1208,7 @@ class Binaries $group['bname'], $group['pname'], $currentPost, - $this->_tablePerGroup === false ? sprintf('AND c.group_id = %d', $groupID) : '' + $this->_tablePerGroup === false ? sprintf('AND c.groups_id = %d', $groupID) : '' ) ); if ($local !== false) { @@ -1398,7 +1398,7 @@ class Binaries */ private function addMissingParts(array $numbers, $tableName, $groupID) { - $insertStr = 'INSERT INTO ' . $tableName . ' (numberid, group_id) VALUES '; + $insertStr = 'INSERT INTO ' . $tableName . ' (numberid, groups_id) VALUES '; foreach ($numbers as $number) { $insertStr .= '(' . $number . ',' . $groupID . '),'; } @@ -1436,7 +1436,7 @@ class Binaries foreach ($numbers as $number) { $sql .= $number . ','; } - $this->_pdo->queryExec((rtrim($sql, ',') . ') AND group_id = ' . $groupID)); + $this->_pdo->queryExec((rtrim($sql, ',') . ') AND groups_id = ' . $groupID)); } /** @@ -1558,7 +1558,7 @@ class Binaries sprintf(' SELECT bb.id, bb.optype, bb.status, bb.description, - bb.groupname AS groupname, bb.regex, g.id AS group_id, bb.msgcol, + bb.groupname AS groupname, bb.regex, g.id AS groups_id, bb.msgcol, bb.last_activity as last_activity FROM binaryblacklist bb LEFT OUTER JOIN groups g ON g.name %s bb.groupname @@ -1674,7 +1674,7 @@ class Binaries */ public function purgeGroup($groupID) { - $this->_pdo->queryExec(sprintf('DELETE c FROM collections c WHERE c.group_id = %d', $groupID)); + $this->_pdo->queryExec(sprintf('DELETE c FROM collections c WHERE c.groups_id = %d', $groupID)); } /** diff --git a/nntmux/Groups.php b/nntmux/Groups.php index bfc505cd6..c9cc8c078 100755 --- a/nntmux/Groups.php +++ b/nntmux/Groups.php @@ -420,7 +420,7 @@ class Groups $this->pdo->queryExec(" DELETE mp FROM missed_parts mp - WHERE mp.group_id = {$id}" + WHERE mp.groups_id = {$id}" ); foreach ($this->cbpm AS $tablePrefix) { diff --git a/nntmux/NZB.php b/nntmux/NZB.php index 77f0f5cde..38dbf5347 100755 --- a/nntmux/NZB.php +++ b/nntmux/NZB.php @@ -180,7 +180,7 @@ class NZB SELECT c.*, UNIX_TIMESTAMP(c.date) AS udate, g.name AS groupname FROM {$this->_tableNames['cName']} c - INNER JOIN groups g ON c.group_id = g.id + INNER JOIN groups g ON c.groups_id = g.id WHERE c.releaseid = "; $this->_binariesQuery = " SELECT b.id, b.name, b.totalparts diff --git a/nntmux/NZBImport.php b/nntmux/NZBImport.php index c831e2d9e..5aa5a5299 100755 --- a/nntmux/NZBImport.php +++ b/nntmux/NZBImport.php @@ -382,7 +382,7 @@ class NZBImport 'useFName' => $useNzbName, 'postDate' => (empty($postDate) ? date("Y-m-d H:i:s") : $postDate), 'from' => (empty($posterName) ? '' : $posterName), - 'group_id' => $groupID, + 'groups_id' => $groupID, 'groupName' => $groupName, 'totalFiles' => $totalFiles, 'totalSize' => $totalSize, @@ -449,12 +449,12 @@ class NZBImport 'name' => $escapedSubject, 'searchname' => $this->pdo->escapeString($cleanName), 'totalpart' => $nzbDetails['totalFiles'], - 'groups_id' => $nzbDetails['group_id'], + 'groups_id' => $nzbDetails['groups_id'], 'guid' => $this->pdo->escapeString($this->relGuid), 'postdate' => $this->pdo->escapeString($nzbDetails['postDate']), 'fromname' => $escapedFromName, 'size' => $this->pdo->escapeString($nzbDetails['totalSize']), - 'categories_id' => $this->category->determineCategory($nzbDetails['group_id'], $cleanName, $escapedFromName), + 'categories_id' => $this->category->determineCategory($nzbDetails['groups_id'], $cleanName, $escapedFromName), 'isrenamed' => $renamed, 'reqidstatus' => 0, 'predb_id' => 0, diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php index 8e354555c..914287d5a 100755 --- a/nntmux/processing/ProcessReleases.php +++ b/nntmux/processing/ProcessReleases.php @@ -249,7 +249,7 @@ class ProcessReleases //Print amount of added releases and time it took. if ($this->echoCLI && $this->tablePerGroup === false) { - $countID = $this->pdo->queryOneRow('SELECT COUNT(id) AS count FROM collections ' . (!empty($groupID) ? ' WHERE group_id = ' . $groupID : '')); + $countID = $this->pdo->queryOneRow('SELECT COUNT(id) AS count FROM collections ' . (!empty($groupID) ? ' WHERE groups_id = ' . $groupID : '')); $this->pdo->log->doEcho( $this->pdo->log->primary( 'Completed adding ' . @@ -338,7 +338,7 @@ class ProcessReleases $this->pdo->log->doEcho($this->pdo->log->header("Process Releases -> Attempting to find complete collections.")); } - $where = (!empty($groupID) ? ' AND c.group_id = ' . $groupID . ' ' : ' '); + $where = (!empty($groupID) ? ' AND c.groups_id = ' . $groupID . ' ' : ' '); $this->processStuckCollections($where); $this->collectionFileCheckStage1($where); @@ -393,7 +393,7 @@ class ProcessReleases $this->tables['bname'], self::COLLFC_SIZED, self::COLLFC_COMPPART, - (!empty($groupID) ? ' AND c.group_id = ' . $groupID : ' ') + (!empty($groupID) ? ' AND c.groups_id = ' . $groupID : ' ') ) ); if ($checked !== false && $this->echoCLI) { @@ -453,7 +453,7 @@ class ProcessReleases AND c.filesize > 0 %s', $this->tables['cname'], self::COLLFC_SIZED, - $this->tablePerGroup === false ? sprintf('AND c.group_id = %d', $groupID['id']) : '' + $this->tablePerGroup === false ? sprintf('AND c.groups_id = %d', $groupID['id']) : '' ) ) !== false ) { @@ -472,7 +472,7 @@ class ProcessReleases $this->tables['bname'], $this->tables['pname'], self::COLLFC_SIZED, - $this->tablePerGroup === false ? sprintf('AND c.group_id = %d', $groupID['id']) : '', + $this->tablePerGroup === false ? sprintf('AND c.groups_id = %d', $groupID['id']) : '', $groupMinSizeSetting, $minSizeSetting, $groupMinSizeSetting, @@ -496,7 +496,7 @@ class ProcessReleases $this->tables['bname'], $this->tables['pname'], self::COLLFC_SIZED, - $this->tablePerGroup === false ? sprintf('AND c.group_id = %d', $groupID['id']) : '', + $this->tablePerGroup === false ? sprintf('AND c.groups_id = %d', $groupID['id']) : '', $maxSizeSetting ) ); @@ -517,7 +517,7 @@ class ProcessReleases $this->tables['bname'], $this->tables['pname'], self::COLLFC_SIZED, - $this->tablePerGroup === false ? sprintf('AND c.group_id = %d', $groupID['id']) : '', + $this->tablePerGroup === false ? sprintf('AND c.groups_id = %d', $groupID['id']) : '', $groupMinFilesSetting, $minFilesSetting, $groupMinFilesSetting, @@ -587,12 +587,12 @@ class ProcessReleases sprintf(' SELECT SQL_NO_CACHE c.*, g.name AS gname FROM %s c - INNER JOIN groups g ON c.group_id = g.id + INNER JOIN groups g ON c.groups_id = g.id WHERE %s c.filecheck = %d AND c.filesize > 0 LIMIT %d', $this->tables['cname'], - (!empty($groupID) ? ' c.group_id = ' . $groupID . ' AND ' : ' '), + (!empty($groupID) ? ' c.groups_id = ' . $groupID . ' AND ' : ' '), self::COLLFC_SIZED, $this->releaseCreationLimit ) @@ -663,12 +663,12 @@ class ProcessReleases 'name' => $cleanRelName, 'searchname' => $this->pdo->escapeString(utf8_encode($cleanedName)), 'totalpart' => $collection['totalfiles'], - 'groups_id' => $collection['group_id'], + 'groups_id' => $collection['groups_id'], 'guid' => $this->pdo->escapeString($this->releases->createGUID()), 'postdate' => $this->pdo->escapeString($collection['date']), 'fromname' => $fromName, 'size' => $collection['filesize'], - 'categories_id' => $categorize->determineCategory($collection['group_id'], $cleanedName), + 'categories_id' => $categorize->determineCategory($collection['groups_id'], $cleanedName), 'isrenamed' => ($properName === true ? 1 : 0), 'reqidstatus' => ($isReqID === true ? 1 : 0), 'predb_id' => ($preID === false ? 0 : $preID), @@ -934,7 +934,7 @@ class ProcessReleases $this->categorizeRelease( $type, (!empty($groupID) - ? 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0 AND group_id = ' . $groupID + ? 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0 AND groups_id = ' . $groupID : 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0') ); @@ -998,7 +998,7 @@ class ProcessReleases $this->tables['bname'], $this->tables['pname'], Settings::value('..partretentionhours'), - (!empty($groupID) && $this->tablePerGroup === false ? ' AND c.group_id = ' . $groupID : '') + (!empty($groupID) && $this->tablePerGroup === false ? ' AND c.groups_id = ' . $groupID : '') ) ); @@ -1038,7 +1038,7 @@ class ProcessReleases $this->tables['cname'], $this->tables['bname'], $this->tables['pname'], - (!empty($groupID) && $this->tablePerGroup === false ? ' AND c.group_id = ' . $groupID : '') + (!empty($groupID) && $this->tablePerGroup === false ? ' AND c.groups_id = ' . $groupID : '') ) ); diff --git a/resources/db/schema/mysql-ddl.sql b/resources/db/schema/mysql-ddl.sql index b16d14331..def03086c 100755 --- a/resources/db/schema/mysql-ddl.sql +++ b/resources/db/schema/mysql-ddl.sql @@ -226,7 +226,7 @@ CREATE TABLE collections ( date DATETIME DEFAULT NULL, xref VARCHAR(255) NOT NULL DEFAULT '', totalfiles INT(11) UNSIGNED NOT NULL DEFAULT '0', - group_id INT(11) UNSIGNED NOT NULL DEFAULT '0', + groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0', collectionhash VARCHAR(255) NOT NULL DEFAULT '0', dateadded DATETIME DEFAULT NULL, added TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -237,7 +237,7 @@ CREATE TABLE collections ( PRIMARY KEY (id), INDEX fromname (fromname), INDEX date (date), - INDEX group_id (group_id), + INDEX groups_id (groups_id), INDEX ix_collection_filecheck (filecheck), INDEX ix_collection_dateadded (dateadded), INDEX ix_collection_releaseid (releaseid), @@ -461,13 +461,13 @@ DROP TABLE IF EXISTS missed_parts; CREATE TABLE missed_parts ( id INT(16) UNSIGNED NOT NULL AUTO_INCREMENT, numberid BIGINT UNSIGNED NOT NULL, - group_id INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to groups.id', + groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to groups.id', attempts TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (id), INDEX ix_missed_parts_attempts (attempts), - INDEX ix_missed_parts_groupid_attempts (group_id, attempts), - INDEX ix_missed_parts_numberid_groupsid_attempts (numberid, group_id, attempts), - UNIQUE INDEX ix_missed_parts_numberid_groupsid (numberid, group_id) + INDEX ix_missed_parts_groupid_attempts (groups_id, attempts), + INDEX ix_missed_parts_numberid_groupsid_attempts (numberid, groups_id, attempts), + UNIQUE INDEX ix_missed_parts_numberid_groupsid (numberid, groups_id) ) ENGINE = MYISAM DEFAULT CHARSET = utf8 @@ -539,7 +539,7 @@ CREATE TABLE multigroup_collections ( date DATETIME DEFAULT NULL, xref VARCHAR(510) NOT NULL DEFAULT '', totalfiles INT(11) UNSIGNED NOT NULL DEFAULT '0', - group_id INT(11) UNSIGNED NOT NULL DEFAULT '0', + groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0', collectionhash VARCHAR(255) NOT NULL DEFAULT '0', dateadded DATETIME DEFAULT NULL, added TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -550,7 +550,7 @@ CREATE TABLE multigroup_collections ( PRIMARY KEY (id), INDEX fromname (fromname), INDEX date (date), - INDEX group_id (group_id), + INDEX groups_id (groups_id), INDEX ix_collection_filecheck (filecheck), INDEX ix_collection_dateadded (dateadded), INDEX ix_collection_releaseid (releaseid),