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 code to remove deprecated Blacklight/Releases class

Browse Source
This commit is contained in:
DariusIII
2025-12-23 09:59:16 +01:00
parent 0e5dfc34be
commit 392926cacb
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/AdditionalProcessing/AdditionalProcessingOrchestrator.php
+2 -2
View File
@@ -6,8 +6,8 @@ use App\Models\Release;
use App\Models\UsenetGroup;
use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
use App\Services\Releases\ReleaseBrowseService;
use App\Services\TempWorkspaceService;
use Blacklight\Releases;
use Exception;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
@@ -248,7 +248,7 @@ class AdditionalProcessingOrchestrator
$this->config->processThumbnails
);
$context->passwordStatus = Releases::PASSWD_NONE;
$context->passwordStatus = ReleaseBrowseService::PASSWD_NONE;
$context->releaseHasPassword = false;
$context->releaseGroupName = UsenetGroup::getNameByID($context->release->groups_id);
$context->releaseHasNoNFO = (int) $context->release->nfostatus !== 1;
app/Services/AdditionalProcessing/ArchiveExtractionService.php
+11 -11
View File
@@ -4,7 +4,7 @@ namespace App\Services\AdditionalProcessing;
use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
use Blacklight\Releases;
use App\Services\Releases\ReleaseBrowseService;
use dariusiii\rarinfo\ArchiveInfo;
use dariusiii\rarinfo\Par2Info;
use Illuminate\Support\Facades\File;
@@ -45,7 +45,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
];
$context->compressedFilesChecked++;
@@ -79,7 +79,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
'standaloneVideoType' => $videoType,
'standaloneVideoData' => $compressedData,
];
@@ -114,7 +114,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => true,
'passwordStatus' => Releases::PASSWD_RAR,
'passwordStatus' => ReleaseBrowseService::PASSWD_RAR,
];
}
@@ -134,7 +134,7 @@ class ArchiveExtractionService
'success' => true,
'files' => $files,
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
'archiveMarker' => $archiveMarker,
'dataSummary' => $dataSummary,
];
@@ -204,7 +204,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
];
if (! $this->config->sevenZipPath) {
@@ -219,7 +219,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => true,
'passwordStatus' => Releases::PASSWD_RAR,
'passwordStatus' => ReleaseBrowseService::PASSWD_RAR,
];
}
@@ -229,7 +229,7 @@ class ArchiveExtractionService
'success' => true,
'files' => $files,
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
'archiveMarker' => '7z',
];
}
@@ -251,7 +251,7 @@ class ArchiveExtractionService
'success' => true,
'files' => $files,
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
'archiveMarker' => '7z',
];
}
@@ -480,7 +480,7 @@ class ArchiveExtractionService
'success' => false,
'files' => [],
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
];
if ($this->config->extractUsingRarInfo || ! $this->config->sevenZipPath) {
@@ -528,7 +528,7 @@ class ArchiveExtractionService
'success' => true,
'files' => $this->filterExtractedFiles($files),
'hasPassword' => false,
'passwordStatus' => Releases::PASSWD_NONE,
'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
'archiveMarker' => $marker,
];
}
app/Services/AdditionalProcessing/ReleaseFileManager.php
+5 -5
View File
@@ -8,7 +8,7 @@ use App\Models\Release;
use App\Models\ReleaseFile;
use App\Services\Search\ElasticSearchService;
use App\Services\Search\ManticoreSearchService;
use Blacklight\Releases;
use App\Services\Releases\ReleaseBrowseService;
use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
use App\Services\NameFixing\NameFixingService;
@@ -63,7 +63,7 @@ class ReleaseFileManager
// Check for password
if (isset($file['pass']) && $file['pass'] === true) {
$context->releaseHasPassword = true;
$context->passwordStatus = Releases::PASSWD_RAR;
$context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
return false;
}
@@ -72,7 +72,7 @@ class ReleaseFileManager
&& preg_match($this->config->innerFileBlacklist, $file['name'])
) {
$context->releaseHasPassword = true;
$context->passwordStatus = Releases::PASSWD_RAR;
$context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
return false;
}
@@ -125,7 +125,7 @@ class ReleaseFileManager
Log::debug('Codec spam found, setting release to potentially passworded.');
}
$context->releaseHasPassword = true;
$context->passwordStatus = Releases::PASSWD_RAR;
$context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
} elseif ($file['name'] !== '' && ! str_starts_with($file['name'], '.')) {
// Run PreDB filename check
$context->release['filename'] = $file['name'];
@@ -185,7 +185,7 @@ class ReleaseFileManager
if (! $context->releaseHasPassword && $context->nzbHasCompressedFile && $releaseFilesCount === 0) {
Release::query()->where('id', $context->release->id)->update($updateRows);
} else {
$updateRows['passwordstatus'] = $processPasswords ? $passwordStatus : Releases::PASSWD_NONE;
$updateRows['passwordstatus'] = $processPasswords ? $passwordStatus : ReleaseBrowseService::PASSWD_NONE;
$updateRows['rarinnerfilecount'] = $releaseFilesCount;
Release::query()->where('id', $context->release->id)->update($updateRows);
}