starred/newznab-tmux-NNTmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 02:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove nzbstatus = 1 usage from queries

Browse Source
This commit is contained in:
DariusIII
2025-08-22 11:56:34 +02:00
parent 7972f83c9d
commit 6507217c53
16 changed files with 41 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/Books.php
+2 -3
View File
@@ -123,8 +123,7 @@ class Books
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM bookinfo boo
LEFT JOIN releases r ON boo.id = r.bookinfo_id
WHERE r.nzbstatus = 1
AND boo.cover = 1
WHERE boo.cover = 1
AND boo.title != ''
AND r.passwordstatus %s
%s %s %s
@@ -265,7 +264,7 @@ class Books
if ($total > 0) {
foreach ($bookids as $i => $iValue) {
$this->processBookReleasesHelper(
Release::query()->where('nzbstatus', '=', NZB::NZB_ADDED)
Release::query()
->whereNull('bookinfo_id')
->whereIn('categories_id', [$iValue])
->orderByDesc('postdate')
Blacklight/Console.php
+2 -3
View File
@@ -157,8 +157,7 @@ class Console
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM consoleinfo con
LEFT JOIN releases r ON con.id = r.consoleinfo_id
WHERE r.nzbstatus = 1
AND con.title != ''
WHERE con.title != ''
AND con.cover = 1
AND r.passwordstatus %s
%s %s %s
@@ -726,7 +725,7 @@ class Console
*/
public function processConsoleReleases(): void
{
$query = Release::query()->select(['searchname', 'id'])->whereBetween('categories_id', [Category::GAME_ROOT, Category::GAME_OTHER])->where('nzbstatus', '=', NZB::NZB_ADDED)->whereNull('consoleinfo_id');
$query = Release::query()->select(['searchname', 'id'])->whereBetween('categories_id', [Category::GAME_ROOT, Category::GAME_OTHER])->whereNull('consoleinfo_id');
if ($this->renamed === true) {
$query->where('isrenamed', '=', 1);
}
Blacklight/Games.php
+1 -2
View File
@@ -192,8 +192,7 @@ class Games
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM gamesinfo gi
LEFT JOIN releases r ON gi.id = r.gamesinfo_id
WHERE r.nzbstatus = 1
AND gi.title != ''
WHERE gi.title != ''
AND gi.cover = 1
AND r.passwordstatus %s
%s %s %s %s
Blacklight/Movie.php
+1 -2
View File
@@ -184,8 +184,7 @@ class Movie
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM movieinfo m
LEFT JOIN releases r USING (imdbid)
WHERE r.nzbstatus = 1
AND m.title != ''
WHERE m.title != ''
AND m.imdbid != '0000000'
AND r.passwordstatus %s
%s %s %s %s
Blacklight/Music.php
+2 -4
View File
@@ -149,8 +149,7 @@ class Music
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM musicinfo m
LEFT JOIN releases r ON r.musicinfo_id = m.id
WHERE r.nzbstatus = 1
AND m.title != ''
WHERE m.title != ''
AND m.cover = 1
AND r.passwordstatus %s
%s %s %s
@@ -402,11 +401,10 @@ class Music
SELECT searchname, id
FROM releases
WHERE musicinfo_id IS NULL
AND nzbstatus = %d %s
%s
AND categories_id IN (%s, %s, %s)
ORDER BY postdate DESC
LIMIT %d',
NZB::NZB_ADDED,
$this->renamed,
Category::MUSIC_MP3,
Category::MUSIC_LOSSLESS,
Blacklight/NameFixer.php
+11 -35
View File
@@ -156,9 +156,7 @@ class NameFixer
SELECT rel.id AS releases_id, rel.fromname
FROM releases rel
INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id)
WHERE rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
WHERE rel.predb_id = 0'
);
$cats = 2;
$preId = true;
@@ -238,9 +236,7 @@ class NameFixer
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 nzbstatus = %d
AND predb_id = 0',
NZB::NZB_ADDED
WHERE predb_id = 0'
);
$cats = 2;
$preId = true;
@@ -300,9 +296,7 @@ class NameFixer
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 nzbstatus = %d
AND predb_id = 0',
NZB::NZB_ADDED
WHERE predb_id = 0'
);
$cats = 2;
$preId = true;
@@ -361,9 +355,7 @@ class NameFixer
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 nzbstatus = %d
AND predb_id = 0',
NZB::NZB_ADDED
WHERE predb_id = 0'
);
$cats = 2;
} else {
@@ -420,9 +412,7 @@ class NameFixer
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 nzbstatus = %d
AND predb_id = 0',
NZB::NZB_ADDED
WHERE predb_id = 0'
);
$cats = 2;
} else {
@@ -480,9 +470,7 @@ class NameFixer
'
SELECT rel.id AS releases_id, rel.guid, rel.groups_id, rel.fromname
FROM releases rel
WHERE rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
WHERE rel.predb_id = 0'
);
$cats = 2;
} else {
@@ -544,9 +532,7 @@ class NameFixer
FROM releases rel
LEFT JOIN media_infos ru ON ru.releases_id = rel.id
WHERE ru.releases_id IS NOT NULL
AND rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
AND rel.predb_id = 0'
);
$cats = 2;
// Otherwise check only releases we haven't renamed and checked uid before in Misc categories
@@ -560,11 +546,9 @@ class NameFixer
FROM releases rel
LEFT JOIN media_infos ru ON ru.releases_id = rel.id
WHERE ru.releases_id IS NOT NULL
AND rel.nzbstatus = %d
AND (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
AND rel.predb_id = 0
AND rel.proc_uid = %d',
NZB::NZB_ADDED,
self::IS_RENAMED_NONE,
Category::OTHER_MISC,
Category::OTHER_HASHED,
@@ -605,9 +589,7 @@ class NameFixer
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.id AS releases_id, rf.movie_name as movie_name
FROM releases rel
INNER JOIN media_infos rf ON rf.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
WHERE rel.predb_id = 0'
);
$cats = 2;
// Otherwise check only releases we haven't renamed and checked uid before in Misc categories
@@ -617,10 +599,8 @@ class NameFixer
SELECT rel.id AS releases_id, rel.name, rel.name AS textstring, rel.predb_id, rel.searchname, rel.fromname, rel.groups_id, rel.categories_id, rel.id AS releases_id, rf.movie_name as movie_name, rf.file_name as file_name
FROM releases rel
INNER JOIN media_infos rf ON rf.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND rel.isrenamed = %d
WHERE rel.isrenamed = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED,
self::IS_RENAMED_NONE
);
if ($cats === 2) {
@@ -669,9 +649,7 @@ class NameFixer
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
WHERE ph.hash != \'\'
AND rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
AND rel.predb_id = 0'
);
$cats = 2;
// Otherwise check only releases we haven't renamed and checked their par2 hash_16K before in Misc categories
@@ -684,12 +662,10 @@ class NameFixer
IFNULL(ph.hash, \'\') AS hash
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
WHERE (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
AND rel.predb_id = 0
AND ph.hash != \'\'
AND rel.proc_hash16k = %d',
NZB::NZB_ADDED,
self::IS_RENAMED_NONE,
Category::OTHER_MISC,
Category::OTHER_HASHED,
Blacklight/Nfo.php
+2 -5
View File
@@ -360,7 +360,6 @@ class Nfo
private function buildNfoProcessingQuery(string $groupID, string $guidChar): \Illuminate\Database\Eloquent\Builder
{
$query = Release::query()
->where('nzbstatus', '=', NZB::NZB_ADDED)
->whereBetween('nfostatus', [$this->maxRetries, self::NFO_UNPROC]);
if ($guidChar !== '') {
@@ -423,7 +422,6 @@ class Nfo
private function handleFailedNfoAttempts(string $groupID, string $guidChar): void
{
$failedQuery = Release::query()
->where('nzbstatus', NZB::NZB_ADDED)
->where('nfostatus', '<', $this->maxRetries)
->where('nfostatus', '>', self::NFO_FAILED);
@@ -458,7 +456,7 @@ class Nfo
/**
* Get a string like this:
* "AND r.nzbstatus = 1 AND r.nfostatus BETWEEN -8 AND -1 AND r.size < 1073741824 AND r.size > 1048576"
* "AND r.nfostatus BETWEEN -8 AND -1 AND r.size < 1073741824 AND r.size > 1048576"
* To use in a query.
*
*
@@ -474,8 +472,7 @@ class Nfo
$maxRetries = ($dummy >= 0 ? -($dummy + 1) : self::NFO_UNPROC);
return sprintf(
'AND r.nzbstatus = %d AND r.nfostatus BETWEEN %d AND %d %s %s',
NZB::NZB_ADDED,
'AND r.nfostatus BETWEEN %d AND %d %s %s',
($maxRetries < -8 ? -8 : $maxRetries),
self::NFO_UNPROC,
($maxSize > 0 ? ('AND r.size < '.($maxSize * 1073741824)) : ''),
Blacklight/ReleaseRemover.php
-1
View File
@@ -436,7 +436,6 @@ class ReleaseRemover
AND r.searchname NOT LIKE %s
AND r.searchname NOT LIKE %s
AND r.searchname NOT LIKE %s
AND r.nzbstatus = 1
AND r.categories_id NOT IN (%d, %d, %d, %d, %d, %d, %d, %d, %d) %s',
// Matches passwort / passworded / etc also.
escapeString('%passwor%'),
Blacklight/Releases.php
+4 -21
View File
@@ -70,8 +70,7 @@ class Releases extends Release
SELECT r.id, r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, r.jpgstatus, g.name AS group_name
FROM releases r
LEFT JOIN usenet_groups g ON g.id = r.groups_id
WHERE r.nzbstatus = %d
AND r.passwordstatus %s
WHERE r.passwordstatus %s
%s %s %s %s %s
ORDER BY %s %s %s
) r
@@ -83,8 +82,7 @@ class Releases extends Release
LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
GROUP BY r.id
ORDER BY %8\$s %9\$s",
NZB::NZB_ADDED,
ORDER BY %7\$s %8\$s",
$this->showPasswords(),
Category::getCategorySearch($cat),
($maxAge > 0 ? (' AND postdate > NOW() - INTERVAL '.$maxAge.' DAY ') : ''),
@@ -120,12 +118,10 @@ class Releases extends Release
'SELECT COUNT(r.id) AS count
FROM releases r
%s
WHERE r.nzbstatus = %d
AND r.passwordstatus %s
WHERE r.passwordstatus %s
%s
%s %s %s ',
($groupName !== -1 ? 'LEFT JOIN usenet_groups g ON g.id = r.groups_id' : ''),
NZB::NZB_ADDED,
$this->showPasswords(),
($groupName !== -1 ? sprintf(' AND g.name = %s', escapeString($groupName)) : ''),
Category::getCategorySearch($cat),
@@ -192,7 +188,6 @@ class Releases extends Release
public function getForExport(string $postFrom = '', string $postTo = '', string $groupID = '')
{
$query = self::query()
->where('r.nzbstatus', NZB::NZB_ADDED)
->select(['r.searchname', 'r.guid', 'g.name as gname', DB::raw("CONCAT(cp.title,'_',c.title) AS catName")])
->from('releases as r')
->leftJoin('categories as c', 'c.id', '=', 'r.categories_id')
@@ -272,7 +267,6 @@ class Releases extends Release
LEFT JOIN categories c ON c.id = r.categories_id
LEFT JOIN root_categories cp ON cp.id = c.root_categories_id
WHERE %s %s
AND r.nzbstatus = %d
AND r.categories_id BETWEEN %d AND %d
AND r.passwordstatus %s
%s
@@ -280,7 +274,6 @@ class Releases extends Release
ORDER BY %s %s %s",
$this->uSQL($userShows, 'videos_id'),
(! empty($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
NZB::NZB_ADDED,
Category::TV_ROOT,
Category::TV_OTHER,
$this->showPasswords(),
@@ -307,13 +300,11 @@ class Releases extends Release
'SELECT r.id
FROM releases r
WHERE %s %s
AND r.nzbstatus = %d
AND r.categories_id BETWEEN %d AND %d
AND r.passwordstatus %s
%s',
$this->uSQL($userShows, 'videos_id'),
(\count($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
NZB::NZB_ADDED,
Category::TV_ROOT,
Category::TV_OTHER,
$this->showPasswords(),
@@ -550,7 +541,6 @@ class Releases extends Release
): string {
$conditions = [
sprintf('r.passwordstatus %s', $this->showPasswords()),
sprintf('r.nzbstatus = %d', NZB::NZB_ADDED),
sprintf('r.id IN (%s)', implode(',', array_map('intval', $searchResult))),
];
@@ -713,7 +703,6 @@ class Releases extends Release
// Build WHERE conditions more efficiently
$conditions = [
sprintf('r.passwordstatus %s', $this->showPasswords()),
sprintf('r.nzbstatus = %d', NZB::NZB_ADDED),
];
if ($maxAge > 0) {
@@ -819,7 +808,6 @@ class Releases extends Release
// Build conditions array for cleaner query building
$conditions = [
sprintf('r.nzbstatus = %d', NZB::NZB_ADDED),
sprintf('r.passwordstatus %s', $this->showPasswords()),
];
@@ -1106,10 +1094,8 @@ class Releases extends Release
}
}
$whereSql = sprintf(
'WHERE r.nzbstatus = %d
AND r.passwordstatus %s
'WHERE r.passwordstatus %s
%s %s %s %s %s %s',
NZB::NZB_ADDED,
$this->showPasswords(),
$showSql,
(! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
@@ -1183,10 +1169,8 @@ class Releases extends Release
$whereSql = sprintf(
'WHERE r.passwordstatus %s
AND r.nzbstatus = %d
%s %s %s %s %s',
$this->showPasswords(),
NZB::NZB_ADDED,
($aniDbID > -1 ? sprintf(' AND r.anidbid = %d ', $aniDbID) : ''),
(! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '',
@@ -1255,7 +1239,6 @@ class Releases extends Release
// Build WHERE conditions more efficiently
$conditions = [
sprintf('r.categories_id BETWEEN %d AND %d', Category::MOVIE_ROOT, Category::MOVIE_OTHER),
sprintf('r.nzbstatus = %d', NZB::NZB_ADDED),
sprintf('r.passwordstatus %s', $this->showPasswords()),
];
Blacklight/Tmux.php
+11 -13
View File
@@ -286,24 +286,23 @@ class Tmux
return sprintf(
'
SELECT
SUM(IF(nzbstatus = %d AND categories_id BETWEEN %d AND %d AND categories_id != %d AND videos_id = 0 AND tv_episodes_id BETWEEN -3 AND 0 AND size > 1048576,1,0)) AS processtv,
SUM(IF(nzbstatus = %1$d AND categories_id = %d AND anidbid IS NULL,1,0)) AS processanime,
SUM(IF(nzbstatus = %1$d AND categories_id BETWEEN %d AND %d AND imdbid IS NULL,1,0)) AS processmovies,
SUM(IF(nzbstatus = %1$d AND categories_id IN (%d, %d, %d) AND musicinfo_id IS NULL,1,0)) AS processmusic,
SUM(IF(nzbstatus = %1$d AND categories_id BETWEEN %d AND %d AND consoleinfo_id IS NULL,1,0)) AS processconsole,
SUM(IF(nzbstatus = %1$d AND categories_id IN (%s) AND bookinfo_id IS NULL,1,0)) AS processbooks,
SUM(IF(nzbstatus = %1$d AND categories_id = %d AND gamesinfo_id = 0,1,0)) AS processgames,
SUM(IF(nzbstatus = %1$d AND categories_id BETWEEN %d AND %d AND xxxinfo_id = 0,1,0)) AS processxxx,
SUM(IF(categories_id BETWEEN %d AND %d AND categories_id != %d AND videos_id = 0 AND tv_episodes_id BETWEEN -3 AND 0 AND size > 1048576,1,0)) AS processtv,
SUM(IF(categories_id = %d AND anidbid IS NULL,1,0)) AS processanime,
SUM(IF(categories_id BETWEEN %d AND %d AND imdbid IS NULL,1,0)) AS processmovies,
SUM(IF(categories_id IN (%d, %d, %d) AND musicinfo_id IS NULL,1,0)) AS processmusic,
SUM(IF(categories_id BETWEEN %d AND %d AND consoleinfo_id IS NULL,1,0)) AS processconsole,
SUM(IF(categories_id IN (%s) AND bookinfo_id IS NULL,1,0)) AS processbooks,
SUM(IF(categories_id = %d AND gamesinfo_id = 0,1,0)) AS processgames,
SUM(IF(categories_id BETWEEN %d AND %d AND xxxinfo_id = 0,1,0)) AS processxxx,
SUM(IF(1=1 %s,1,0)) AS processnfo,
SUM(IF(nzbstatus = %1$d AND isrenamed = %d AND predb_id = 0 AND passwordstatus >= 0 AND nfostatus > %d
SUM(IF(isrenamed = %d AND predb_id = 0 AND passwordstatus >= 0 AND nfostatus > %d
AND ((nfostatus = %d AND proc_nfo = %d) OR proc_files = %d OR proc_par2 = %d
OR (ishashed = 1 AND dehashstatus BETWEEN -6 AND 0)) AND categories_id IN (%s),1,0)) AS processrenames,
SUM(IF(isrenamed = %d,1,0)) AS renamed,
SUM(IF(nzbstatus = %1$d AND nfostatus = %20$d,1,0)) AS nfo,
SUM(IF(nfostatus = %20$d,1,0)) AS nfo,
SUM(IF(predb_id > 0,1,0)) AS predb_matched,
COUNT(DISTINCT(predb_id)) AS distinct_predb_matched
FROM releases r',
NZB::NZB_ADDED,
Category::TV_ROOT,
Category::TV_OTHER,
Category::TV_ANIME,
@@ -344,8 +343,7 @@ class Tmux
return "SELECT
(SELECT COUNT(r.id) FROM releases r
LEFT JOIN categories c ON c.id = r.categories_id
WHERE r.nzbstatus = 1
AND r.passwordstatus = -1
WHERE r.passwordstatus = -1
AND r.haspreview = -1
{$ppminString}
{$ppmaxString}
Blacklight/XXX.php
+2 -4
View File
@@ -88,8 +88,7 @@ class XXX
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM xxxinfo xxx
LEFT JOIN releases r ON xxx.id = r.xxxinfo_id
WHERE r.nzbstatus = 1
AND xxx.title != ''
WHERE xxx.title != ''
AND r.passwordstatus %s
%s %s %s %s
GROUP BY xxx.id
@@ -149,8 +148,7 @@ class XXX
LEFT OUTER JOIN categories c ON c.id = r.categories_id
LEFT OUTER JOIN root_categories cp ON cp.id = c.root_categories_id
INNER JOIN xxxinfo xxx ON xxx.id = r.xxxinfo_id
WHERE r.nzbstatus = 1
AND xxx.id IN (%s)
WHERE xxx.id IN (%s)
AND xxx.title != ''
AND r.passwordstatus %s
%s %s %s %s
Blacklight/libraries/Runners/PostProcessRunner.php
+1 -7
View File
@@ -65,8 +65,7 @@ class PostProcessRunner extends BaseRunner
SELECT DISTINCT LEFT(r.leftguid, 1) AS id
FROM releases r
LEFT JOIN categories c ON c.id = r.categories_id
WHERE r.nzbstatus = '.NZB::NZB_ADDED.'
AND r.passwordstatus = -1
WHERE r.passwordstatus = -1
AND r.haspreview = -1
AND c.disablepreview = 0
'.$ppAddMaxSize.' '.$ppAddMinSize.'
@@ -120,7 +119,6 @@ class PostProcessRunner extends BaseRunner
SELECT id
FROM releases
WHERE categories_id BETWEEN 2000 AND 2999
AND nzbstatus = '.NZB::NZB_ADDED.'
AND imdbid IS NULL
'.$condLookup.' '.$condRenamedOnly.'
LIMIT 1';
@@ -135,7 +133,6 @@ class PostProcessRunner extends BaseRunner
SELECT DISTINCT LEFT(leftguid, 1) AS id, '.$renamedFlag.' AS renamed
FROM releases
WHERE categories_id BETWEEN 2000 AND 2999
AND nzbstatus = '.NZB::NZB_ADDED.'
AND imdbid IS NULL
'.$condLookup.' '.$condRenamedOnly.'
LIMIT 16';
@@ -161,7 +158,6 @@ class PostProcessRunner extends BaseRunner
FROM releases
WHERE categories_id BETWEEN 5000 AND 5999
AND categories_id != 5070
AND nzbstatus = '.NZB::NZB_ADDED.'
AND videos_id = 0
AND size > 1048576
AND tv_episodes_id BETWEEN -3 AND 0
@@ -179,7 +175,6 @@ class PostProcessRunner extends BaseRunner
FROM releases
WHERE categories_id BETWEEN 5000 AND 5999
AND categories_id != 5070
AND nzbstatus = '.NZB::NZB_ADDED.'
AND videos_id = 0
AND tv_episodes_id BETWEEN -3 AND 0
AND size > 1048576
@@ -208,7 +203,6 @@ class PostProcessRunner extends BaseRunner
FROM releases
WHERE categories_id BETWEEN 5000 AND 5999
AND categories_id != 5070
AND nzbstatus = '.NZB::NZB_ADDED.'
AND videos_id = 0
AND size > 1048576
AND tv_episodes_id BETWEEN -3 AND 0
Blacklight/processing/post/AniDB.php
+1 -1
View File
@@ -59,7 +59,7 @@ class AniDB
*/
public function processAnimeReleases(): void
{
$results = Release::query()->where('nzbstatus', NZB::NZB_ADDED)->whereNull('anidbid')->where('categories_id', Category::TV_ANIME)->orderByDesc('postdate')->limit($this->aniqty)->get();
$results = Release::query()->whereNull('anidbid')->where('categories_id', Category::TV_ANIME)->orderByDesc('postdate')->limit($this->aniqty)->get();
if (\count($results) > 0) {
$this->doRandomSleep();
app/Http/Controllers/Api/RSS.php
-6
View File
@@ -73,12 +73,10 @@ class RSS extends ApiController
LEFT OUTER JOIN tv_episodes tve ON tve.id = r.tv_episodes_id
LEFT OUTER JOIN bookinfo bo ON bo.id = r.bookinfo_id
WHERE r.passwordstatus %s
AND r.nzbstatus = %d
%s %s %s %s
ORDER BY postdate DESC %s",
$cartSearch,
$this->releases->showPasswords(),
NZB::NZB_ADDED,
$catSearch,
($videosId > 0 ? sprintf('AND r.videos_id = %d %s', $videosId, ($catSearch === '' ? $catLimit : '')) : ''),
($aniDbID > 0 ? sprintf('AND r.anidbid = %d %s', $aniDbID, ($catSearch === '' ? $catLimit : '')) : ''),
@@ -115,7 +113,6 @@ class RSS extends ApiController
LEFT OUTER JOIN videos v ON v.id = r.videos_id
LEFT OUTER JOIN tv_episodes tve ON tve.id = r.tv_episodes_id
WHERE %s %s %s
AND r.nzbstatus = %d
AND r.categories_id BETWEEN %d AND %d
AND r.passwordstatus %s
ORDER BY postdate DESC %s",
@@ -133,7 +130,6 @@ class RSS extends ApiController
),
(\count($excludedCats) ? 'AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
($airDate > -1 ? sprintf('AND tve.firstaired >= DATE_SUB(CURDATE(), INTERVAL %d DAY) ', $airDate) : ''),
NZB::NZB_ADDED,
Category::TV_ROOT,
Category::TV_OTHER,
$this->releases->showPasswords(),
@@ -168,7 +164,6 @@ class RSS extends ApiController
LEFT JOIN usenet_groups g ON g.id = r.groups_id
LEFT JOIN movieinfo mi ON mi.id = r.movieinfo_id
WHERE %s %s
AND r.nzbstatus = %d
AND r.categories_id BETWEEN %d AND %d
AND r.passwordstatus %s
ORDER BY postdate DESC %s",
@@ -185,7 +180,6 @@ class RSS extends ApiController
'imdbid'
),
(\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
NZB::NZB_ADDED,
Category::MOVIE_ROOT,
Category::MOVIE_OTHER,
$this->releases->showPasswords(),
app/Models/Release.php
-3
View File
@@ -275,8 +275,6 @@ class Release extends Model
}
$releases = self::query()
->where('nzbstatus', '=', NZB::NZB_ADDED)
->select(['releases.*', 'g.name as group_name', 'c.title as category_name'])
->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id')
->leftJoin('usenet_groups as g', 'g.id', '=', 'releases.groups_id')
@@ -303,7 +301,6 @@ class Release extends Model
}
$releases = self::query()
->where('nzbstatus', '=', NZB::NZB_ADDED)
->select(
[
'releases.id',
misc/update/tmux/bin/groupfixrelnames.php
+1 -2
View File
@@ -48,7 +48,6 @@ switch (true) {
LEFT JOIN par_hashes ph ON ph.releases_id = r.id
WHERE r.leftguid = %s
AND r.nzbstatus = %d
AND r.isrenamed = %d
AND r.predb_id = 0
AND r.passwordstatus >= 0
@@ -74,7 +73,7 @@ switch (true) {
AND r.categories_id IN (%s)
GROUP BY r.id
ORDER BY r.id DESC
LIMIT %s", escapeString($guidChar), NZB::NZB_ADDED, NameFixer::IS_RENAMED_NONE, Nfo::NFO_UNPROC, Nfo::NFO_FOUND, NameFixer::PROC_NFO_NONE, NameFixer::PROC_FILES_NONE, NameFixer::PROC_UID_NONE, NameFixer::PROC_PAR2_NONE, NameFixer::PROC_SRR_NONE, NameFixer::PROC_HASH16K_NONE, NameFixer::PROC_CRC_NONE, Category::getCategoryOthersGroup(), $maxPerRun));
LIMIT %s", escapeString($guidChar), NameFixer::IS_RENAMED_NONE, Nfo::NFO_UNPROC, Nfo::NFO_FOUND, NameFixer::PROC_NFO_NONE, NameFixer::PROC_FILES_NONE, NameFixer::PROC_UID_NONE, NameFixer::PROC_PAR2_NONE, NameFixer::PROC_SRR_NONE, NameFixer::PROC_HASH16K_NONE, NameFixer::PROC_CRC_NONE, Category::getCategoryOthersGroup(), $maxPerRun));
foreach ($releases as $release) {
$nameFixer->checked++;