From d19c102dc42e15792696290923901951be6cafa8 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 21 Oct 2015 14:39:00 +0200 Subject: [PATCH] Rename release_files to releasefiles --- Changelog | 1 + misc/update_scripts/python/fixreleasenames_threaded.py | 4 ++-- misc/update_scripts/python/groupfixrelnames_threaded.py | 4 ++-- newznab/NameFixer.php | 8 ++++---- newznab/processing/PostProcess.php | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog b/Changelog index ac0c1b937..3e84d6ad8 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2015-10-21 DariusIII + Fix: Rename release_files to releasefiles Fix: Add back spotnab processing to PostProcess Chg: Disable rage checking in Nfo until new method is added Fix: one extra argument in query diff --git a/misc/update_scripts/python/fixreleasenames_threaded.py b/misc/update_scripts/python/fixreleasenames_threaded.py index 12f77ca65..fab165e6e 100644 --- a/misc/update_scripts/python/fixreleasenames_threaded.py +++ b/misc/update_scripts/python/fixreleasenames_threaded.py @@ -65,11 +65,11 @@ elif len(sys.argv) > 1 and sys.argv[1] == "miscsorter": cur[0].execute(run, (int(perrun[0]) * int(run_threads[0]))) datas = cur[0].fetchall() elif len(sys.argv) > 1 and (sys.argv[1] == "filename"): - run = "SELECT DISTINCT rel.id AS releaseid FROM releases rel INNER JOIN release_files relfiles ON (relfiles.releaseid = rel.id) WHERE nzbstatus = 1 AND proc_files = 0 AND" + clean + "ORDER BY postdate ASC LIMIT %s" + run = "SELECT DISTINCT rel.id AS releaseid FROM releases rel INNER JOIN releasefiles relfiles ON (relfiles.releaseid = rel.id) WHERE nzbstatus = 1 AND proc_files = 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] == "md5"): - run = "SELECT DISTINCT rel.id FROM releases rel LEFT OUTER JOIN release_files rf ON rel.id = rf.releaseid AND rf.ishashed = 1 WHERE nzbstatus = 1 AND rel.dehashstatus BETWEEN -6 AND 0 AND rel.ishashed = 1 AND prehashid = 0 ORDER BY dehashstatus DESC, postdate ASC LIMIT %s" + run = "SELECT DISTINCT rel.id FROM releases rel LEFT OUTER JOIN releasefiles rf ON rel.id = rf.releaseid AND rf.ishashed = 1 WHERE nzbstatus = 1 AND rel.dehashstatus BETWEEN -6 AND 0 AND rel.ishashed = 1 AND prehashid = 0 ORDER BY dehashstatus DESC, 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] == "par2"): diff --git a/misc/update_scripts/python/groupfixrelnames_threaded.py b/misc/update_scripts/python/groupfixrelnames_threaded.py index 067bc69f8..bc6c9e332 100644 --- a/misc/update_scripts/python/groupfixrelnames_threaded.py +++ b/misc/update_scripts/python/groupfixrelnames_threaded.py @@ -54,12 +54,12 @@ if threads > 16: maxperrun = int(run_perrun[0]) if sys.argv[1] == "md5": - join = "LEFT OUTER JOIN release_files rf ON r.id = rf.releaseid AND rf.ishashed = 1" + join = "LEFT OUTER JOIN releasefiles rf ON r.id = rf.releaseid AND rf.ishashed = 1" where = "r.ishashed = 1 AND r.dehashstatus BETWEEN -6 AND 0" elif sys.argv[1] == "nfo": where = "r.proc_nfo = 0 AND r.nfostatus = 1" elif sys.argv[1] == "filename": - join = "INNER JOIN release_files rf ON r.id = rf.releaseid" + join = "INNER JOIN releasefiles rf ON r.id = rf.releaseid" where = "r.proc_files = 0" elif sys.argv[1] == "par2": where = "r.proc_par2 = 0" diff --git a/newznab/NameFixer.php b/newznab/NameFixer.php index e62c32f05..2eb83ea9f 100755 --- a/newznab/NameFixer.php +++ b/newznab/NameFixer.php @@ -254,7 +254,7 @@ class NameFixer SELECT rf.name AS textstring, rel.categoryid, rel.name, rel.searchname, rel.groupid, rf.releaseid AS fileid, rel.id AS releaseid FROM releases rel - INNER JOIN release_files rf ON (rf.releaseid = rel.id) + INNER JOIN releasefiles rf ON (rf.releaseid = rel.id) WHERE nzbstatus = %d AND preid = 0', NZB::NZB_ADDED @@ -266,7 +266,7 @@ class NameFixer SELECT rf.name AS textstring, rel.categoryid, rel.name, rel.searchname, rel.groupid, rf.releaseid AS fileid, rel.id AS releaseid FROM releases rel - INNER JOIN release_files rf ON (rf.releaseid = rel.id) + INNER JOIN releasefiles rf ON (rf.releaseid = rel.id) WHERE (isrenamed = %d OR rel.categoryid = %d) AND proc_files = %d', self::IS_RENAMED_NONE, @@ -720,7 +720,7 @@ class NameFixer } echo $this->pdo->log->header("\nMatch PreFiles (${args[1]}) Started at " . date('g:i:s')); - echo $this->pdo->log->primary("Matching predb filename to cleaned release_files.name.\n"); + echo $this->pdo->log->primary("Matching predb filename to cleaned releasefiles.name.\n"); $query = $this->pdo->queryDirect( sprintf(' @@ -728,7 +728,7 @@ class NameFixer r.groupid, r.categoryid, rf.name AS filename FROM releases r - INNER JOIN release_files rf ON r.id = rf.releaseid + INNER JOIN releasefiles rf ON r.id = rf.releaseid AND rf.name IS NOT NULL WHERE r.prehashid = 0 GROUP BY r.id diff --git a/newznab/processing/PostProcess.php b/newznab/processing/PostProcess.php index 4ef70a751..5e75de1ed 100755 --- a/newznab/processing/PostProcess.php +++ b/newznab/processing/PostProcess.php @@ -399,7 +399,7 @@ class PostProcess $this->pdo->queryOneRow( sprintf(' SELECT id - FROM release_files + FROM releasefiles WHERE releaseid = %d AND name = %s', $relID, @@ -428,7 +428,7 @@ class PostProcess // If we found some files. if ($filesAdded > 0) { - $this->debugging->log(get_class(), __FUNCTION__, 'Added ' . $filesAdded . ' release_files from PAR2 for ' . $query['searchname'], Logger::LOG_INFO); + $this->debugging->log(get_class(), __FUNCTION__, 'Added ' . $filesAdded . ' releasefiles from PAR2 for ' . $query['searchname'], Logger::LOG_INFO); // Update the file count with the new file count + old file count. $this->pdo->queryExec(