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

Show unprocessed releases in search

Browse Source
This commit is contained in:
DariusIII
2026-05-14 10:30:35 +02:00
parent 088863f6e0
commit 4b04ac9625
8 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/NntmuxSearchDiag.php
+2 -4
View File
@@ -197,10 +197,8 @@ class NntmuxSearchDiag extends Command
return 'MISSING_IN_INDEX';
}
$hidden = false;
if (! $showPasswords && (int) $release->passwordstatus !== 0) {
$hidden = true;
}
$maxVisiblePasswordStatus = $showPasswords ? 1 : 0;
$hidden = (int) $release->passwordstatus > $maxVisiblePasswordStatus;
$expected = ReleaseSearchIndexDocument::normalize($release->toArray());
unset($expected['id']);
app/Http/Controllers/Api/RSS.php
+7 -6
View File
@@ -76,7 +76,7 @@ class RSS extends ApiController
%s %s %s %s
ORDER BY postdate DESC %s",
$cartSearch,
$this->releaseBrowseService->showPasswords(),
$this->releaseBrowseService->showPasswordsForRss(),
$catSearch,
($videosId > 0 ? sprintf('AND r.videos_id = %d %s', $videosId, ($catSearch === '' ? $catLimit : '')) : ''),
($aniDbID > 0 ? sprintf('AND r.anidbid = %d %s', $aniDbID, ($catSearch === '' ? $catLimit : '')) : ''),
@@ -141,7 +141,8 @@ class RSS extends ApiController
'min_size' => 0,
'max_age_days' => 0,
'groups_id' => null,
'password_allow_rar' => str_contains($this->releaseBrowseService->showPasswords(), '<='),
'password_allow_rar' => $this->releaseBrowseService->passwordAllowRar(),
'password_status_min' => 0,
'sort_field' => 'postdate_ts',
'sort_dir' => 'desc',
'try_fuzzy' => false,
@@ -205,7 +206,7 @@ class RSS extends ApiController
($airDate > -1 ? sprintf(' AND tve.firstaired >= DATE_SUB(CURDATE(), INTERVAL %d DAY)', $airDate) : ''),
Category::TV_ROOT,
Category::TV_OTHER,
$this->releaseBrowseService->showPasswords(),
$this->releaseBrowseService->showPasswordsForRss(),
! empty($limit) ? sprintf(' LIMIT %d OFFSET 0', min($limit, 100)) : ''
);
@@ -235,7 +236,7 @@ class RSS extends ApiController
(\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
Category::MOVIE_ROOT,
Category::MOVIE_OTHER,
$this->releaseBrowseService->showPasswords(),
$this->releaseBrowseService->showPasswordsForRss(),
! empty($limit) ? sprintf(' LIMIT %d OFFSET 0', min($limit, 100)) : ''
);
@@ -309,7 +310,7 @@ class RSS extends ApiController
WHERE rn <= 5
ORDER BY FIELD(imdbid, '%s'), postdate DESC",
implode("','", $topMovies->toArray()),
$this->releaseBrowseService->showPasswords(),
$this->releaseBrowseService->showPasswordsForRss(),
implode("','", $topMovies->toArray())
);
@@ -376,7 +377,7 @@ class RSS extends ApiController
WHERE rn <= 5
ORDER BY FIELD(videos_id, %s), postdate DESC",
implode(',', $topShows->toArray()),
$this->releaseBrowseService->showPasswords(),
$this->releaseBrowseService->showPasswordsForRss(),
implode(',', $topShows->toArray())
);
app/Services/Releases/ReleaseBrowseService.php
+22 -3
View File
@@ -117,7 +117,7 @@ class ReleaseBrowseService
'min_size' => $minSize,
'max_age_days' => $maxAge,
'groups_id' => $groupId,
'password_allow_rar' => str_contains($this->showPasswords(), '<='),
'password_allow_rar' => $this->passwordAllowRar(),
'sort_field' => $indexSort,
'sort_dir' => $orderBy[1] ?? 'desc', // @phpstan-ignore offsetAccess.notFound
'try_fuzzy' => true,
@@ -365,7 +365,7 @@ class ReleaseBrowseService
'min_size' => $minSize,
'max_age_days' => $maxAge,
'groups_id' => $groupId,
'password_allow_rar' => str_contains($this->showPasswords(), '<='),
'password_allow_rar' => $this->passwordAllowRar(),
'sort_field' => $indexSortField,
'sort_dir' => $orderBy[1] ?? 'desc',
'try_fuzzy' => false,
@@ -432,10 +432,29 @@ class ReleaseBrowseService
return match ($setting) {
1 => '<= '.self::PASSWD_RAR,
default => '= '.self::PASSWD_NONE,
default => '<= '.self::PASSWD_NONE,
};
}
/**
* When true, search/browse includes RAR-passworded releases (passwordstatus <= 1).
*/
public function passwordAllowRar(): bool
{
return (int) Settings::settingValue('showpasswordedrelease') === 1;
}
/**
* Password clause for RSS/feed SQL: excludes untested backlog (passwordstatus = -1).
* Site search and browse use {@see showPasswords()} which includes -1 until post-processing.
*/
public function showPasswordsForRss(): string
{
return $this->passwordAllowRar()
? 'BETWEEN '.self::PASSWD_NONE.' AND '.self::PASSWD_RAR
: '= '.self::PASSWD_NONE;
}
/**
* Use to order releases on site.
*
app/Services/Releases/ReleaseSearchService.php
+12 -4
View File
@@ -118,7 +118,7 @@ class ReleaseSearchService
'min_date' => $minDateCriteria,
'max_date' => $maxDateCriteria,
'groups_id' => $groupId,
'password_allow_rar' => str_contains($this->showPasswords(), '<='),
'password_allow_rar' => $this->passwordAllowRar(),
'sort_field' => $this->browseOrderToIndexSortField((string) $orderBy[0]),
'sort_dir' => $orderBy[1] ?? 'desc',
'try_fuzzy' => true,
@@ -261,7 +261,7 @@ class ReleaseSearchService
'min_size' => $minSize,
'max_age_days' => $maxAge,
'groups_id' => $groupId,
'password_allow_rar' => str_contains($this->showPasswords(), '<='),
'password_allow_rar' => $this->passwordAllowRar(),
'sort_field' => $this->browseOrderToIndexSortField($orderField),
'sort_dir' => $orderDir,
'try_fuzzy' => true,
@@ -1606,7 +1606,7 @@ class ReleaseSearchService
'excluded_category_ids' => array_map(static fn ($id): int => (int) $id, $excludedCategories),
'min_size' => $minSize,
'max_age_days' => $maxAge,
'password_allow_rar' => str_contains($this->showPasswords(), '<='),
'password_allow_rar' => $this->passwordAllowRar(),
'sort_field' => 'postdate_ts',
'sort_dir' => 'desc',
'try_fuzzy' => false,
@@ -1940,10 +1940,18 @@ class ReleaseSearchService
return match ($setting) {
1 => '<= '.self::PASSWD_RAR,
default => '= '.self::PASSWD_NONE,
default => '<= '.self::PASSWD_NONE,
};
}
/**
* When true, search/browse includes RAR-passworded releases (passwordstatus <= 1).
*/
private function passwordAllowRar(): bool
{
return (int) Settings::settingValue('showpasswordedrelease') === 1;
}
/**
* Use to order releases on site.
*
app/Services/Search/Contracts/SearchServiceInterface.php
+2 -2
View File
@@ -346,8 +346,8 @@ interface SearchServiceInterface
*
* @param array<string, mixed> $criteria Keys: phrases (string|array|null), category_ids (list<int>|null),
* excluded_category_ids (list<int>), min_size (int), max_age_days (int),
* groups_id (int|null), password_allow_rar (bool), sort_field (string),
* sort_dir (string), try_fuzzy (bool), release_ids (list<int>|null)
* groups_id (int|null), password_allow_rar (bool), password_status_min (int|null),
* sort_field (string), sort_dir (string), try_fuzzy (bool), release_ids (list<int>|null)
* @return array{ids: list<int>, total: int, fuzzy: bool}
*/
public function searchReleasesFiltered(array $criteria, int $limit, int $offset = 0): array;
app/Services/Search/Drivers/ElasticSearchDriver.php
+5 -1
View File
@@ -3107,7 +3107,11 @@ class ElasticSearchDriver implements SearchDriverInterface
if ($allowRar) {
$filter[] = ['range' => ['passwordstatus' => ['lte' => 1]]];
} else {
$filter[] = ['term' => ['passwordstatus' => 0]];
$filter[] = ['range' => ['passwordstatus' => ['lte' => 0]]];
}
if (array_key_exists('password_status_min', $criteria) && $criteria['password_status_min'] !== null) {
$filter[] = ['range' => ['passwordstatus' => ['gte' => (int) $criteria['password_status_min']]]];
}
return $filter;
app/Services/Search/Drivers/ManticoreSearchDriver.php
+5 -1
View File
@@ -2670,7 +2670,11 @@ class ManticoreSearchDriver implements SearchDriverInterface
if ($allowRar) {
$query->filter('passwordstatus', 'lte', 1);
} else {
$query->filter('passwordstatus', '=', 0);
$query->filter('passwordstatus', 'lte', 0);
}
if (array_key_exists('password_status_min', $criteria) && $criteria['password_status_min'] !== null) {
$query->filter('passwordstatus', 'gte', (int) $criteria['password_status_min']);
}
}
tests/Unit/ReleaseSearchServiceOrderingTest.php
+4 -4
View File
@@ -174,14 +174,14 @@ class ReleaseSearchServiceOrderingTest extends TestCase
$sql = $method->invoke(
$this->service,
'WHERE r.passwordstatus = 0 AND r.id IN (1,2,3)',
'WHERE r.passwordstatus <= 0 AND r.id IN (1,2,3)',
['postdate', 'desc'],
50,
0
);
$this->assertSame(
'SELECT r.id FROM releases r WHERE r.passwordstatus = 0 AND r.id IN (1,2,3) ORDER BY r.postdate desc LIMIT 50 OFFSET 0',
'SELECT r.id FROM releases r WHERE r.passwordstatus <= 0 AND r.id IN (1,2,3) ORDER BY r.postdate desc LIMIT 50 OFFSET 0',
$sql
);
$this->assertStringNotContainsString('JOIN', $sql);
@@ -201,9 +201,9 @@ class ReleaseSearchServiceOrderingTest extends TestCase
$service->expects($this->once())
->method('getPagerCount')
->with('SELECT COUNT(*) as count FROM releases r WHERE r.passwordstatus = 0 AND r.id IN (1,2,3)')
->with('SELECT COUNT(*) as count FROM releases r WHERE r.passwordstatus <= 0 AND r.id IN (1,2,3)')
->willReturn(3);
$this->assertSame(3, $method->invoke($service, 'WHERE r.passwordstatus = 0 AND r.id IN (1,2,3)'));
$this->assertSame(3, $method->invoke($service, 'WHERE r.passwordstatus <= 0 AND r.id IN (1,2,3)'));
}
}