diff --git a/Changelog b/Changelog index 58babcf59..29abd3b62 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2016-05-13 DariusIII + * Fix: Properly fix renaming issues introduced by renaming releaseid to releases_id 2016-05-12 DariusIII * Fix: Wrong path to fixrelnames script in TmuxRun * Upd: Add leftguid column to releases table for better threading. diff --git a/misc/update/nix/tmux/bin/groupfixrelnames.php b/misc/update/nix/tmux/bin/groupfixrelnames.php index ef55ea27a..7157fed72 100644 --- a/misc/update/nix/tmux/bin/groupfixrelnames.php +++ b/misc/update/nix/tmux/bin/groupfixrelnames.php @@ -44,7 +44,7 @@ if (!isset($argv[1])) { foreach ($releases as $release) { if (preg_match('/^=newz\[NZB\]=\w+/', $release['textstring'])) { $namefixer->done = $namefixer->matched = false; - $pdo->queryDirect(sprintf('UPDATE releases SET proc_nfo = 1 WHERE id = %d', $release['releaseid'])); + $pdo->queryDirect(sprintf('UPDATE releases SET proc_nfo = 1 WHERE id = %d', $release['releases_id'])); $namefixer->checked++; echo '.'; } else { @@ -66,7 +66,7 @@ if (!isset($argv[1])) { case $pieces[0] === 'md5' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun): $releases = $pdo->queryDirect( sprintf(' - SELECT DISTINCT r.id AS releaseid, r.name, r.searchname, r.categories_id, r.groupid, r.dehashstatus, + SELECT DISTINCT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, r.dehashstatus, rf.name AS filename FROM releases r LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id AND rf.ishashed = 1 @@ -88,7 +88,7 @@ if (!isset($argv[1])) { } else if (preg_match('/[a-fA-F0-9]{32,40}/i', $release['filename'], $matches)) { $namefixer->matchPredbHash($matches[0], $release, 1, 1, true, 1); } else { - $pdo->queryExec(sprintf("UPDATE releases SET dehashstatus = %d - 1 WHERE id = %d", $release['dehashstatus'], $release['releaseid'])); + $pdo->queryExec(sprintf("UPDATE releases SET dehashstatus = %d - 1 WHERE id = %d", $release['dehashstatus'], $release['releases_id'])); echo '.'; } } @@ -97,7 +97,7 @@ if (!isset($argv[1])) { case $pieces[0] === 'par2' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun): $releases = $pdo->queryDirect( sprintf(' - SELECT r.id AS releaseid, r.guid, r.groupid + SELECT r.id AS releases_id, r.guid, r.groupid FROM releases r WHERE r.leftguid = %s AND r.nzbstatus = 1 @@ -124,7 +124,7 @@ if (!isset($argv[1])) { ) ); foreach ($releases as $release) { - $res = $nzbcontents->checkPAR2($release['guid'], $release['releaseid'], $release['groupid'], 1, 1); + $res = $nzbcontents->checkPAR2($release['guid'], $release['releases_id'], $release['groupid'], 1, 1); if ($res === false) { echo '.'; } @@ -134,7 +134,7 @@ if (!isset($argv[1])) { case $pieces[0] === 'miscsorter' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun): $releases = $pdo->queryDirect( sprintf(' - SELECT r.id AS releaseid + SELECT r.id AS releases_id FROM releases r WHERE r.leftguid = %s AND r.nzbstatus = 1 AND r.nfostatus = 1 @@ -150,7 +150,7 @@ if (!isset($argv[1])) { if ($releases instanceof Traversable) { $sorter = new MiscSorter(true, $pdo); foreach ($releases as $release) { - $res = $sorter->nfosorter(null, $release['releaseid']); + $res = $sorter->nfosorter(null, $release['releases_id']); } } break; diff --git a/newznab/MiscSorter.php b/newznab/MiscSorter.php index ac8bdcef2..da6386ff3 100644 --- a/newznab/MiscSorter.php +++ b/newznab/MiscSorter.php @@ -237,7 +237,7 @@ class MiscSorter $release = $this->pdo->queryOneRow( sprintf(" - SELECT r.id AS releaseid, r.searchname AS searchname, + SELECT r.id AS releases_id, r.searchname AS searchname, r.name AS name, r.categories_id, r.groupid FROM releases r WHERE r.id = %d", diff --git a/newznab/NameFixer.php b/newznab/NameFixer.php index f6c2d841a..966417c14 100755 --- a/newznab/NameFixer.php +++ b/newznab/NameFixer.php @@ -188,7 +188,7 @@ class NameFixer $preId = false; if ($cats === 3) { $query = sprintf(' - SELECT rel.id AS releaseid + SELECT rel.id AS releases_id FROM releases rel INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id) WHERE rel.nzbstatus = %d @@ -199,7 +199,7 @@ class NameFixer $preId = true; } else { $query = sprintf(' - SELECT rel.id AS releaseid + SELECT rel.id AS releases_id FROM releases rel INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id) WHERE (rel.isrenamed = %d OR rel.categories_id = %d) @@ -223,11 +223,11 @@ class NameFixer $releaseRow = $this->pdo->queryOneRow( sprintf(' SELECT nfo.releases_id AS nfoid, rel.groupid, rel.categories_id, rel.name, rel.searchname, - UNCOMPRESS(nfo) AS textstring, rel.id AS releaseid + UNCOMPRESS(nfo) AS textstring, rel.id AS releases_id FROM releases rel INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id) WHERE rel.id = %d', - $rel['releaseid'] + $rel['releases_id'] ) ); @@ -235,7 +235,7 @@ class NameFixer // Ignore encrypted NFOs. if (preg_match('/^=newz\[NZB\]=\w+/', $releaseRow['textstring'])) { - $this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $rel['releaseid']); + $this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $rel['releases_id']); continue; } @@ -272,7 +272,7 @@ class NameFixer if ($cats === 3) { $query = sprintf(' SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid, - rf.releases_id AS fileid, rel.id AS releaseid + rf.releases_id AS fileid, rel.id AS releases_id FROM releases rel INNER JOIN release_files rf ON (rf.releases_id = rel.id) WHERE rel.nzbstatus = %d @@ -284,7 +284,7 @@ class NameFixer } else { $query = sprintf(' SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid, - rf.releases_id AS fileid, rel.id AS releaseid + rf.releases_id AS fileid, rel.id AS releases_id FROM releases rel INNER JOIN release_files rf ON (rf.releases_id = rel.id) WHERE (rel.isrenamed = %d OR rel.categories_id = %d) @@ -347,7 +347,7 @@ class NameFixer if ($cats === 3) { $query = sprintf(' SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid, - rf.releases_id AS fileid, rel.id AS releaseid + rf.releases_id AS fileid, rel.id AS releases_id FROM releases rel INNER JOIN release_files rf ON (rf.releases_id = rel.id) WHERE rel.nzbstatus = %d @@ -359,7 +359,7 @@ class NameFixer } else { $query = sprintf(' SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid, - rf.releases_id AS fileid, rel.id AS releaseid + rf.releases_id AS fileid, rel.id AS releases_id FROM releases rel INNER JOIN release_files rf ON (rf.releases_id = rel.id) WHERE (rel.isrenamed = %d OR rel.categories_id IN (%d, %d)) @@ -417,7 +417,7 @@ class NameFixer if ($cats === 3) { $query = sprintf(' - SELECT rel.id AS releaseid, rel.guid, rel.groupid + SELECT rel.id AS releases_id, rel.guid, rel.groupid FROM releases rel WHERE rel.nzbstatus = %d AND rel.predb_id = 0', @@ -426,7 +426,7 @@ class NameFixer $cats = 2; } else { $query = sprintf(' - SELECT rel.id AS releaseid, rel.guid, rel.groupid + SELECT rel.id AS releases_id, rel.guid, rel.groupid FROM releases rel WHERE rel.isrenamed = %d AND rel.proc_par2 = %d', @@ -644,7 +644,7 @@ class NameFixer $this->pdo->log->headerOver("Method: ") . $this->pdo->log->primary($type . $method) . $this->pdo->log->headerOver("ReleaseID: ") . - $this->pdo->log->primary($release["releaseid"]); + $this->pdo->log->primary($release["releases_id"]); if (isset($release['filename']) && $release['filename'] != "") { echo $this->pdo->log->headerOver("Filename: ") . @@ -775,7 +775,7 @@ class NameFixer //Find release matches with fulltext and then identify exact matches with cleaned LIKE string $res = $this->pdo->queryDirect( sprintf(" - SELECT r.id AS releaseid, r.name, r.searchname, + SELECT r.id AS releases_id, r.name, r.searchname, r.groupid, r.categories_id FROM releases r %1\$s @@ -798,7 +798,7 @@ class NameFixer $this->updateRelease($row, $pre['title'], $method = "Title Match source: " . $pre['source'], $echo, "PreDB FT Exact, ", $namestatus, $show, $pre['predb_id']); $matching++; } else { - $this->_updateSingleColumn('predb_id', $pre['predb_id'], $row['releaseid']); + $this->_updateSingleColumn('predb_id', $pre['predb_id'], $row['releases_id']); } } } elseif ($total >= 16) { @@ -854,7 +854,7 @@ class NameFixer $query = $this->pdo->queryDirect( sprintf(' - SELECT r.id AS releaseid, r.name, r.searchname, + SELECT r.id AS releases_id, r.name, r.searchname, r.groupid, r.categories_id, rf.name AS filename FROM releases r @@ -1017,7 +1017,7 @@ class NameFixer $matching++; } } else { - $this->_updateSingleColumn('dehashstatus', $release['dehashstatus'] - 1, $release['releaseid']); + $this->_updateSingleColumn('dehashstatus', $release['dehashstatus'] - 1, $release['releases_id']); } return $matching; @@ -1080,14 +1080,14 @@ class NameFixer // set NameFixer process flags after run if ($namestatus == 1 && $this->matched === false) { switch ($type) { - case "NFO, ": - $this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $release['releaseid']); + case "NFO, ": + $this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $release['releases_id']); break; case "Filenames, ": - $this->_updateSingleColumn('proc_files', self::PROC_FILES_DONE, $release['releaseid']); + $this->_updateSingleColumn('proc_files', self::PROC_FILES_DONE, $release['releases_id']); break; case "PAR2, ": - $this->_updateSingleColumn('proc_par2', self::PROC_FILES_DONE, $release['releaseid']); + $this->_updateSingleColumn('proc_par2', self::PROC_FILES_DONE, $release['releases_id']); break; } } @@ -1133,7 +1133,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|(?updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.Text.source.group", $echo, $type, $namestatus, $show); @@ -1168,7 +1168,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[-\w.\',;& ]+(480|720|1080)[ip][._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.Text.res.vcod.group", $echo, $type, $namestatus, $show); @@ -1213,7 +1213,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/\w[-\w.\',;& ]+(ASIA|DLC|EUR|GOTY|JPN|KOR|MULTI\d{1}|NTSCU?|PAL|RF|Region[._ -]?Free|USA|XBLA)[._ -](DLC[._ -]Complete|FRENCH|GERMAN|MULTI\d{1}|PROPER|PSN|READ[._ -]?NFO|UMD)?[._ -]?(GC|NDS|NGC|PS3|PSP|WII|XBOX(360)?)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["0"], $method = "gameCheck: Videogames 1", $echo, $type, $namestatus, $show); @@ -1242,7 +1242,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/\w[-\w.\',;& ]+(\d{1,10}|Linux|UNIX)[._ -](RPM)?[._ -]?(X64)?[._ -]?(Incl)[._ -](Keygen)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["0"], $method = "appCheck: Apps 1", $echo, $type, $namestatus, $show); @@ -1269,7 +1269,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releases_id"]) { + if ($this->done === false && $this->relid !== $release['releases_id']) { if (preg_match('/:\s*.*[\\\\\/]([A-Z0-9].+?S\d+[.-_ ]?[ED]\d+.+?)\.\w{2,}\s+/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["1"], $method = "nfoCheck: Generic TV 1", $echo, $type, $namestatus, $show); @@ -1577,7 +1577,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/^(.+?(x264|XviD)\-TVP)\\\\/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["1"], $method = "fileCheck: TVP", $echo, $type, $namestatus, $show); @@ -1641,7 +1641,7 @@ class NameFixer { $result = []; - if ($this->done === false && $this->relid !== $release["releaseid"]) { + if ($this->done === false && $this->relid !== $release["releases_id"]) { if (preg_match('/(.+?)\.(srr)$/i', $release["textstring"], $result)) { $this->updateRelease($release, $result["1"], $method = "srrCheck: Srr filename", $echo, $type, $namestatus, $show); } diff --git a/newznab/PreDb.php b/newznab/PreDb.php index b102ad947..9f4407703 100644 --- a/newznab/PreDb.php +++ b/newznab/PreDb.php @@ -74,7 +74,7 @@ Class PreDb $res = $this->pdo->queryDirect( sprintf(' - SELECT p.id AS predb_id, r.id AS releaseid + SELECT p.id AS predb_id, r.id AS releases_id FROM predb p INNER JOIN releases r FORCE INDEX (ix_releases_preid_searchname) @@ -91,7 +91,7 @@ Class PreDb if ($res instanceof \Traversable) { foreach ($res as $row) { $this->pdo->queryExec( - sprintf('UPDATE releases SET predb_id = %d WHERE id = %d', $row['predb_id'], $row['releaseid']) + sprintf('UPDATE releases SET predb_id = %d WHERE id = %d', $row['predb_id'], $row['releases_id']) ); if ($this->echooutput) { @@ -189,12 +189,12 @@ Class PreDb $regex = "AND (r.ishashed = 1 OR rf.ishashed = 1)"; if ($cats === 3) { - $query = sprintf('SELECT r.id AS releaseid, r.name, r.searchname, r.categories_id, r.groupid, ' + $query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, ' . 'dehashstatus, rf.name AS filename FROM releases r ' . 'LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id ' . 'WHERE nzbstatus = 1 AND dehashstatus BETWEEN -6 AND 0 AND predb_id = 0 %s', $regex); } else { - $query = sprintf('SELECT r.id AS releaseid, r.name, r.searchname, r.categories_id, r.groupid, ' + $query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, ' . 'dehashstatus, rf.name AS filename FROM releases r ' . 'LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id ' . 'WHERE nzbstatus = 1 AND isrenamed = 0 AND dehashstatus BETWEEN -6 AND 0 %s %s %s', $regex, $ct, $tq); diff --git a/newznab/processing/PostProcess.php b/newznab/processing/PostProcess.php index 1b076d3b1..e37637a79 100755 --- a/newznab/processing/PostProcess.php +++ b/newznab/processing/PostProcess.php @@ -339,7 +339,7 @@ class PostProcess $query = $this->pdo->queryOneRow( sprintf(' - SELECT id, groupid, categories_id, name, searchname, UNIX_TIMESTAMP(postdate) AS post_date, id AS releaseid + SELECT id, groupid, categories_id, name, searchname, UNIX_TIMESTAMP(postdate) AS post_date, id AS releases_id FROM releases WHERE isrenamed = 0 AND id = %d', @@ -472,7 +472,7 @@ class PostProcess SELECT r.id, r.groupid, r.categories_id, r.name, r.searchname, UNIX_TIMESTAMP(r.postdate) AS post_date, - r.id AS releaseid, + r.id AS releases_id, g.name AS groupname FROM releases r LEFT JOIN groups g ON r.groupid = g.id