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

Update passworded releases handling. Closes #980

Browse Source
This commit is contained in:
DariusIII
2019-10-29 23:35:28 +01:00
parent 03754a7729
commit f128ef8d76
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/Releases.php
+5 -7
View File
@@ -166,18 +166,16 @@ class Releases extends Release
/**
* @return string
*/
public function showPasswords(): ?string
public function showPasswords()
{
$show = (int) Settings::settingValue('..showpasswordedrelease');
$setting = $show ?? 1;
$setting = $show ?? 0;
switch ($setting) {
case 0: // Hide releases with a password or a potential password (Hide unprocessed releases).
return '= '.self::PASSWD_NONE;
case 1: // Shows everything.
default:
return '<= '.self::PASSWD_RAR;
case 0:
default:// Hide releases with a password.
return '= '.self::PASSWD_NONE;
}
}
Blacklight/processing/ProcessReleases.php
+1 -1
View File
@@ -908,7 +908,7 @@ class ProcessReleases
// Passworded releases.
if ((int) Settings::settingValue('..deletepasswordedrelease') === 1) {
$releases = Release::query()->where('passwordstatus', '=', Releases::PASSWD_RAR)->select(['id', 'guid'])->get();
$releases = Release::query()->join('release_files', 'release_files.releases_id', '=', 'releases.id')->select(['id', 'guid'])->where('release_files.passworded', '=', Releases::PASSWD_RAR)->orWhere('passwordstatus', '=', Releases::PASSWD_RAR)->get();
foreach ($releases as $release) {
$this->releases->deleteSingle(['g' => $release->guid, 'i' => $release->id], $this->nzb, $this->releaseImage);
$passwordDeleted++;
app/Http/Controllers/Api/ApiController.php
+2 -1
View File
@@ -18,7 +18,8 @@ use App\Http\Controllers\BasePageController;
class ApiController extends BasePageController
{
/**
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Symfony\Component\HttpFoundation\StreamedResponse
* @throws \Throwable
*/
public function api(Request $request)
database/fixtures/settings.php
+2 -2
View File
@@ -725,8 +725,8 @@ return [
'section' => '',
'subsection' => '',
'name' => 'showpasswordedrelease',
'value' => '10',
'hint' => 'Whether to show passworded or potentially passworded releases in browse, search, api and rss feeds. Potentially passworded means releases which contain .cab or .ace files which are typically password protected. (*yes): Unprocessed releases are hidden. (*no): Unprocessed releases are displayed.',
'value' => '0',
'hint' => 'Whether to show or hide passworded releases in browse, search, api and rss feeds.',
'setting' => 'showpasswordedrelease',
],
92 => [
database/seeds/SettingsTableSeeder.php
+2 -2
View File
@@ -730,8 +730,8 @@ class SettingsTableSeeder extends Seeder
'section' => '',
'subsection' => '',
'name' => 'showpasswordedrelease',
'value' => '10',
'hint' => 'Whether to show passworded or potentially passworded releases in browse, search, api and rss feeds. Potentially passworded means releases which contain .cab or .ace files which are typically password protected. (*yes): Unprocessed releases are hidden. (*no): Unprocessed releases are displayed.',
'value' => '0',
'hint' => 'Whether to show or hide passworded releases in browse, search, api and rss feeds.',
'setting' => 'showpasswordedrelease',
],
92 => [