diff --git a/Blacklight/processing/PostProcess.php b/Blacklight/processing/PostProcess.php index 580aa0358..25185376e 100755 --- a/Blacklight/processing/PostProcess.php +++ b/Blacklight/processing/PostProcess.php @@ -2,10 +2,6 @@ namespace Blacklight\processing; -use Blacklight\NameFixer; -use Blacklight\Nfo; -use Blacklight\NNTP; -use Blacklight\processing\post\ProcessAdditional; use App\Services\AnimeProcessor; use App\Services\BooksProcessor; use App\Services\ConsolesProcessor; @@ -16,6 +12,10 @@ use App\Services\NfoProcessor; use App\Services\Par2Processor; use App\Services\TvProcessor; use App\Services\XXXProcessor; +use Blacklight\NameFixer; +use Blacklight\Nfo; +use Blacklight\NNTP; +use Blacklight\processing\post\ProcessAdditional; use dariusiii\rarinfo\Par2Info; class PostProcess @@ -42,15 +42,23 @@ class PostProcess private Nfo $Nfo; private Par2Processor $par2Processor; + private TvProcessor $tvProcessor; + private NfoProcessor $nfoProcessor; private MoviesProcessor $moviesProcessor; + private MusicProcessor $musicProcessor; + private BooksProcessor $booksProcessor; + private ConsolesProcessor $consolesProcessor; + private GamesProcessor $gamesProcessor; + private AnimeProcessor $animeProcessor; + private XXXProcessor $xxxProcessor; public function __construct() @@ -212,7 +220,7 @@ class PostProcess */ public function processAdditional(int|string $groupID = '', string $guidChar = ''): void { - (new ProcessAdditional())->start($groupID, $guidChar); + (new ProcessAdditional)->start($groupID, $guidChar); } /** diff --git a/app/Services/AnimeProcessor.php b/app/Services/AnimeProcessor.php index 8e8bccbdd..ddc57c4aa 100644 --- a/app/Services/AnimeProcessor.php +++ b/app/Services/AnimeProcessor.php @@ -17,8 +17,7 @@ class AnimeProcessor public function process(): void { if ((int) Settings::settingValue('lookupanidb') !== 0) { - (new AniDB())->processAnimeReleases(); + (new AniDB)->processAnimeReleases(); } } } - diff --git a/app/Services/BooksProcessor.php b/app/Services/BooksProcessor.php index 987160894..626c33c4a 100644 --- a/app/Services/BooksProcessor.php +++ b/app/Services/BooksProcessor.php @@ -17,8 +17,7 @@ class BooksProcessor public function process(): void { if ((int) Settings::settingValue('lookupbooks') !== 0) { - (new Books())->processBookReleases(); + (new Books)->processBookReleases(); } } } - diff --git a/app/Services/ConsolesProcessor.php b/app/Services/ConsolesProcessor.php index 081eb911d..7b8d52978 100644 --- a/app/Services/ConsolesProcessor.php +++ b/app/Services/ConsolesProcessor.php @@ -17,8 +17,7 @@ class ConsolesProcessor public function process(): void { if ((int) Settings::settingValue('lookupgames') !== 0) { - (new Console())->processConsoleReleases(); + (new Console)->processConsoleReleases(); } } } - diff --git a/app/Services/GamesProcessor.php b/app/Services/GamesProcessor.php index 53999e747..ce9d7932f 100644 --- a/app/Services/GamesProcessor.php +++ b/app/Services/GamesProcessor.php @@ -17,8 +17,7 @@ class GamesProcessor public function process(): void { if ((int) Settings::settingValue('lookupgames') !== 0) { - (new Games())->processGamesReleases(); + (new Games)->processGamesReleases(); } } } - diff --git a/app/Services/MoviesProcessor.php b/app/Services/MoviesProcessor.php index 8a9f84ad4..7ba302519 100644 --- a/app/Services/MoviesProcessor.php +++ b/app/Services/MoviesProcessor.php @@ -16,17 +16,15 @@ class MoviesProcessor } /** - * @param string $groupID - * @param string $guidChar - * @param int|string|null $processMovies 0/1/2 or '' to read from settings + * @param int|string|null $processMovies 0/1/2 or '' to read from settings + * * @throws GuzzleException */ public function process(string $groupID = '', string $guidChar = '', int|string|null $processMovies = ''): void { $processMovies = (is_numeric($processMovies) ? $processMovies : Settings::settingValue('lookupimdb')); if ($processMovies > 0) { - (new Movie())->processMovieReleases($groupID, $guidChar, $processMovies); + (new Movie)->processMovieReleases($groupID, $guidChar, $processMovies); } } } - diff --git a/app/Services/MusicProcessor.php b/app/Services/MusicProcessor.php index 175580cc4..7dbfdb7f0 100644 --- a/app/Services/MusicProcessor.php +++ b/app/Services/MusicProcessor.php @@ -17,8 +17,7 @@ class MusicProcessor public function process(): void { if ((int) Settings::settingValue('lookupmusic') !== 0) { - (new Music())->processMusicReleases(); + (new Music)->processMusicReleases(); } } } - diff --git a/app/Services/NfoProcessor.php b/app/Services/NfoProcessor.php index 2f92e05e5..34d6afa76 100644 --- a/app/Services/NfoProcessor.php +++ b/app/Services/NfoProcessor.php @@ -32,4 +32,3 @@ class NfoProcessor } } } - diff --git a/app/Services/Par2Processor.php b/app/Services/Par2Processor.php index afbfc1d9f..52eb62835 100644 --- a/app/Services/Par2Processor.php +++ b/app/Services/Par2Processor.php @@ -17,8 +17,11 @@ use Illuminate\Support\Carbon; class Par2Processor { private NameFixer $nameFixer; + private Par2Info $par2Info; + private bool $addPar2; + private bool $alternateNNTP; public function __construct(NameFixer $nameFixer, Par2Info $par2Info, bool $addPar2, bool $alternateNNTP) @@ -128,4 +131,3 @@ class Par2Processor return false; } } - diff --git a/app/Services/TvProcessor.php b/app/Services/TvProcessor.php index 7886f2ac3..71dca80ec 100644 --- a/app/Services/TvProcessor.php +++ b/app/Services/TvProcessor.php @@ -20,19 +20,16 @@ class TvProcessor /** * Process all TV related releases across supported providers. * - * @param string $groupID - * @param string $guidChar * @param int|string|null $processTV 0/1/2 or '' to read from settings */ public function process(string $groupID = '', string $guidChar = '', int|string|null $processTV = ''): void { $processTV = (is_numeric($processTV) ? $processTV : Settings::settingValue('lookuptv')); if ($processTV > 0) { - (new TVDB())->processSite($groupID, $guidChar, $processTV); - (new TVMaze())->processSite($groupID, $guidChar, $processTV); - (new TMDB())->processSite($groupID, $guidChar, $processTV); - (new TraktTv())->processSite($groupID, $guidChar, $processTV); + (new TVDB)->processSite($groupID, $guidChar, $processTV); + (new TVMaze)->processSite($groupID, $guidChar, $processTV); + (new TMDB)->processSite($groupID, $guidChar, $processTV); + (new TraktTv)->processSite($groupID, $guidChar, $processTV); } } } - diff --git a/app/Services/XXXProcessor.php b/app/Services/XXXProcessor.php index cedbe3bf9..29e10cca5 100644 --- a/app/Services/XXXProcessor.php +++ b/app/Services/XXXProcessor.php @@ -17,8 +17,7 @@ class XXXProcessor public function process(): void { if ((int) Settings::settingValue('lookupxxx') === 1) { - (new XXX())->processXXXReleases(); + (new XXX)->processXXXReleases(); } } } -