From a69f10334f05a69741e4280b4494295fa02ebe6a Mon Sep 17 00:00:00 2001 From: Darko Date: Thu, 4 Sep 2014 09:49:49 +0200 Subject: [PATCH 1/7] Fix for filesize PHP notice --- lib/ReleaseCleaner.php | 4 +--- lib/copy_this/www/lib/releases.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ReleaseCleaner.php b/lib/ReleaseCleaner.php index 7ee8e506f..3b6b814cd 100644 --- a/lib/ReleaseCleaner.php +++ b/lib/ReleaseCleaner.php @@ -15,7 +15,6 @@ class ReleaseCleaning { public $subject = ''; public $groupName = ''; - public $size = ''; public $fromName = ''; /** @@ -30,13 +29,12 @@ class ReleaseCleaning $this->db = new DB(); } - public function releaseCleaner($subject, $fromName, $size, $groupName, $usepre = false) + public function releaseCleaner($subject, $fromName, $groupName, $usepre = false) { $match = $matches = array(); $this->groupName = $groupName; $this->subject = $subject; $this->fromName = $fromName; - $this->size = $size; // Get pre style name from releases.name if (preg_match_all('/([\w\(\)]+[\s\._-]([\w\(\)]+[\s\._-])+[\w\(\)]+-\w+)/', $this->subject, $matches)) { diff --git a/lib/copy_this/www/lib/releases.php b/lib/copy_this/www/lib/releases.php index 1b9b49439..7eb300494 100644 --- a/lib/copy_this/www/lib/releases.php +++ b/lib/copy_this/www/lib/releases.php @@ -1694,7 +1694,7 @@ class Releases $releaseCleaning = new ReleaseCleaning(); $cleanRelName = $this->cleanReleaseName($row['relname']); $cleanedName = $releaseCleaning->releaseCleaner( - $row['relname'], $row['fromname'], $row['filesize'], $row['group_name'] + $row['relname'], $row['fromname'], $row['group_name'] ); if (is_array($cleanedName)) { From 31c07e2627ddc4a10a19f4f166109e9e3b3ab641 Mon Sep 17 00:00:00 2001 From: Darko Date: Mon, 8 Sep 2014 13:28:17 +0200 Subject: [PATCH 2/7] Remove require_once for config.php --- lib/Enzebe.php | 1 - lib/IRCScraper.php | 1 - lib/IRCScraper/scrape.php | 1 - lib/Info.php | 1 - lib/Konsole.php | 1 - lib/Pprocess.php | 1 - lib/ProcessAdditional.php | 1 - lib/ReleaseCleaner.php | 1 - lib/ReleaseRemover.php | 1 - lib/Sharing.php | 1 - lib/TraktTv.php | 1 - lib/TvAnger.php | 1 - lib/copy_this/misc/update_scripts/import.php | 1 - lib/fixReleaseNames.php | 2 -- lib/functions.php | 1 - lib/namefixer.php | 1 - lib/nzbcontents.php | 1 - lib/postprocess_pre.php | 1 - lib/prehash.php | 1 - lib/removeCrapReleases.php | 2 -- lib/showsleep.php | 1 - 21 files changed, 23 deletions(-) diff --git a/lib/Enzebe.php b/lib/Enzebe.php index a89104300..8283f9c6f 100644 --- a/lib/Enzebe.php +++ b/lib/Enzebe.php @@ -1,5 +1,4 @@ Date: Mon, 8 Sep 2014 13:36:06 +0200 Subject: [PATCH 3/7] Add / --- lib/removeCrapReleases.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/removeCrapReleases.php b/lib/removeCrapReleases.php index a370a0aad..453eedeb6 100644 --- a/lib/removeCrapReleases.php +++ b/lib/removeCrapReleases.php @@ -3,9 +3,9 @@ /* * This script deletes releases that match certain criteria, type php removeCrapReleases.php false for details. */ -require_once(WWW_DIR."lib/framework/db.php"); -require_once(WWW_DIR."lib/releases.php"); -require_once(WWW_DIR."lib/site.php"); +require_once(WWW_DIR."/lib/framework/db.php"); +require_once(WWW_DIR."/lib/releases.php"); +require_once(WWW_DIR."/lib/site.php"); require_once("functions.php"); require_once ("ColorCLI.php"); require_once("ReleaseRemover.php"); From 9380ab0181d8f1d9dad5160f6d5c77856ee0adf9 Mon Sep 17 00:00:00 2001 From: Darko Date: Mon, 8 Sep 2014 13:54:01 +0200 Subject: [PATCH 4/7] Add back the config.php. --- lib/postprocess_pre.php | 3 ++- lib/removeCrapReleases.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/postprocess_pre.php b/lib/postprocess_pre.php index 07b15a7fc..66805ddef 100644 --- a/lib/postprocess_pre.php +++ b/lib/postprocess_pre.php @@ -1,5 +1,6 @@ Date: Mon, 8 Sep 2014 13:59:29 +0200 Subject: [PATCH 5/7] Increase the limit on releases processed. --- python/groupfixrelnames_threaded.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/groupfixrelnames_threaded.py b/python/groupfixrelnames_threaded.py index 57f8d37c3..45aedbc49 100644 --- a/python/groupfixrelnames_threaded.py +++ b/python/groupfixrelnames_threaded.py @@ -39,7 +39,7 @@ where = "" datelimit = "AND DATEDIFF(NOW(), r.adddate) <= 7" groupby = "GROUP BY LEFT(r.guid, 1)" orderby = "ORDER BY LEFT(r.guid, 1) ASC" -rowlimit = "LIMIT 16" +rowlimit = "LIMIT 100" cur[0].execute("SELECT value FROM tmux WHERE setting = 'fixnamethreads'") run_threads = cur[0].fetchone() From 71299bf682775dbce832e92d228b3498004b60e7 Mon Sep 17 00:00:00 2001 From: Darko Date: Mon, 8 Sep 2014 14:07:18 +0200 Subject: [PATCH 6/7] Add back require_once for config.php --- lib/namefixer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/namefixer.php b/lib/namefixer.php index 12532ba3b..bb75f0609 100644 --- a/lib/namefixer.php +++ b/lib/namefixer.php @@ -1,4 +1,5 @@ Date: Mon, 8 Sep 2014 14:17:11 +0200 Subject: [PATCH 7/7] Missed one setting. --- lib/namefixer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/namefixer.php b/lib/namefixer.php index bb75f0609..e10e07004 100644 --- a/lib/namefixer.php +++ b/lib/namefixer.php @@ -77,6 +77,7 @@ class NameFixer $this->timeall = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) GROUP BY rel.ID ORDER BY postdate DESC'; $this->fullother = ' AND rel.categoryID IN (1090, 2020, 3050, 6050, 5050, 7050, 8010) GROUP BY rel.ID'; $this->fullall = ''; + $this->_fileName = ''; $this->done = $this->matched = false; $this->c = new ColorCLI(); $this->consoletools = new ConsoleTools();