From 75d5b4a8396ecdeb1353cd7edaa4d14979402dc5 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 7 May 2024 21:04:10 +0200 Subject: [PATCH] Fix classes usage --- Blacklight/ElasticSearchSiteSearch.php | 16 +++++++++------- Blacklight/NZB.php | 1 - Blacklight/Releases.php | 3 ++- Blacklight/processing/ProcessReleases.php | 1 - Blacklight/processing/adult/AEBN.php | 2 ++ Blacklight/processing/tv/TMDB.php | 8 -------- misc/testing/Dev/clean_nzbs.php | 1 + misc/testing/NZB/nzb-reorg.php | 3 ++- misc/testing/PostProc/getGameCovers.php | 1 + misc/testing/PostProc/getXXXCovers.php | 1 + misc/testing/PostProc/getXXXSamples.php | 1 + misc/testing/nzb-import.php | 1 + misc/update/tmux/run.php | 1 + 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Blacklight/ElasticSearchSiteSearch.php b/Blacklight/ElasticSearchSiteSearch.php index 545071b93..e6e9e4b16 100644 --- a/Blacklight/ElasticSearchSiteSearch.php +++ b/Blacklight/ElasticSearchSiteSearch.php @@ -3,7 +3,9 @@ namespace Blacklight; use App\Models\Release; +use Elasticsearch; use Elasticsearch\Common\Exceptions\ElasticsearchException; +use Elasticsearch\Elasticsearch\ClientBuilder; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; @@ -156,7 +158,7 @@ class ElasticSearchSiteSearch 'id' => $parameters['id'], ]; - \Elasticsearch::index($data); + Elasticsearch::index($data); } public function updateRelease(int $id): void @@ -187,7 +189,7 @@ class ElasticSearchSiteSearch 'id' => $new->id, ]; - \Elasticsearch::update($data); + Elasticsearch::update($data); } } @@ -208,7 +210,7 @@ class ElasticSearchSiteSearch ]; try { - $primaryResults = \Elasticsearch::search($search); + $primaryResults = Elasticsearch::search($search); $results = []; foreach ($primaryResults['hits']['hits'] as $primaryResult) { @@ -234,7 +236,7 @@ class ElasticSearchSiteSearch 'id' => $parameters['id'], ]; - \Elasticsearch::index($data); + Elasticsearch::index($data); } public function updatePreDb(array $parameters): void @@ -254,12 +256,12 @@ class ElasticSearchSiteSearch 'id' => $parameters['id'], ]; - \Elasticsearch::update($data); + Elasticsearch::update($data); } protected function search(array $search, bool $fullResults = false): array { - $results = \Elasticsearch::search($search); + $results = Elasticsearch::search($search); $searchResult = []; while (isset($results['hits']['hits']) && count($results['hits']['hits']) > 0) { @@ -275,7 +277,7 @@ class ElasticSearchSiteSearch $scroll_id = $results['_scroll_id']; // Execute a Scroll request and repeat - $results = \Elasticsearch::scroll([ + $results = Elasticsearch::scroll([ 'scroll_id' => $scroll_id, //...using our previously obtained _scroll_id 'scroll' => '30s', // and the same timeout window ] diff --git a/Blacklight/NZB.php b/Blacklight/NZB.php index b1de51644..b11196dd0 100755 --- a/Blacklight/NZB.php +++ b/Blacklight/NZB.php @@ -352,7 +352,6 @@ class NZB $result[$i]['groups'][] = (string) $g; } - unset($result[$i]['segments']['@attributes']); if ($options['no-file-key']) { $i++; } diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index ec14e5d0c..39b3e4969 100644 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -6,6 +6,7 @@ use App\Models\Category; use App\Models\Release; use App\Models\Settings; use App\Models\UsenetGroup; +use Elasticsearch; use Elasticsearch\Common\Exceptions\Missing404Exception; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Arr; @@ -365,7 +366,7 @@ class Releases extends Release ]; try { - \Elasticsearch::delete($params); + Elasticsearch::delete($params); } catch (Missing404Exception $e) { //we do nothing here just catch the error, we don't care if release is missing from ES, we are deleting it anyway } diff --git a/Blacklight/processing/ProcessReleases.php b/Blacklight/processing/ProcessReleases.php index 4e7fc45e6..801591dc3 100755 --- a/Blacklight/processing/ProcessReleases.php +++ b/Blacklight/processing/ProcessReleases.php @@ -381,7 +381,6 @@ class ProcessReleases * * @throws \Throwable */ - #[ArrayShape(['added' => 'int', 'dupes' => 'int'])] public function createReleases(int|string $groupID): array { $startTime = now()->toImmutable(); diff --git a/Blacklight/processing/adult/AEBN.php b/Blacklight/processing/adult/AEBN.php index dd6b2084c..52752a090 100755 --- a/Blacklight/processing/adult/AEBN.php +++ b/Blacklight/processing/adult/AEBN.php @@ -53,6 +53,8 @@ class AEBN extends AdultMovies */ protected string $_title = ''; + private $cookie; + /** * Gets Trailer URL . will be processed in XXX insertswf. */ diff --git a/Blacklight/processing/tv/TMDB.php b/Blacklight/processing/tv/TMDB.php index 79367d731..510eb4967 100644 --- a/Blacklight/processing/tv/TMDB.php +++ b/Blacklight/processing/tv/TMDB.php @@ -338,14 +338,6 @@ class TMDB extends TV * Assigns API episode response values to a formatted array for insertion * Returns the formatted array. */ - #[ArrayShape([ - 'title' => 'string', - 'series' => 'int', - 'episode' => 'int', - 'se_complete' => 'string', - 'firstaired' => 'string', - 'summary' => 'string', - ])] protected function formatEpisodeInfo($episode): array { return [ diff --git a/misc/testing/Dev/clean_nzbs.php b/misc/testing/Dev/clean_nzbs.php index 0e48ff8fb..776f1a093 100644 --- a/misc/testing/Dev/clean_nzbs.php +++ b/misc/testing/Dev/clean_nzbs.php @@ -9,6 +9,7 @@ use Blacklight\NZB; use Blacklight\ReleaseImage; use Blacklight\Releases; use Blacklight\utility\Utility; +use Illuminate\Support\Facades\File; $dir = resource_path().'/movednzbs/'; $colorCli = new ColorCLI(); diff --git a/misc/testing/NZB/nzb-reorg.php b/misc/testing/NZB/nzb-reorg.php index 50a075cdf..419f6aed9 100755 --- a/misc/testing/NZB/nzb-reorg.php +++ b/misc/testing/NZB/nzb-reorg.php @@ -2,7 +2,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; -use Blacklight\ConsoleTools; + use App\Models\Settings; + use Blacklight\ConsoleTools; use Blacklight\NZB; if (! isset($argv[1]) || ! isset($argv[2])) { diff --git a/misc/testing/PostProc/getGameCovers.php b/misc/testing/PostProc/getGameCovers.php index dd96d1311..9a7eafb44 100644 --- a/misc/testing/PostProc/getGameCovers.php +++ b/misc/testing/PostProc/getGameCovers.php @@ -6,6 +6,7 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\ColorCLI; use Blacklight\Games; +use Illuminate\Support\Facades\DB; $pdo = DB::connection()->getPdo(); $game = new Games(['Echo' => true]); diff --git a/misc/testing/PostProc/getXXXCovers.php b/misc/testing/PostProc/getXXXCovers.php index c78e58417..b5efeecbc 100644 --- a/misc/testing/PostProc/getXXXCovers.php +++ b/misc/testing/PostProc/getXXXCovers.php @@ -5,6 +5,7 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\ColorCLI; use Blacklight\XXX; +use Illuminate\Support\Facades\DB; $movie = new XXX(); $c = new ColorCLI(); diff --git a/misc/testing/PostProc/getXXXSamples.php b/misc/testing/PostProc/getXXXSamples.php index f5644cfdc..252dd4a7f 100644 --- a/misc/testing/PostProc/getXXXSamples.php +++ b/misc/testing/PostProc/getXXXSamples.php @@ -5,6 +5,7 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use App\Models\Category; use Blacklight\ColorCLI; use Blacklight\ReleaseImage; +use Illuminate\Support\Facades\DB; $pdo = DB::connection()->getPdo(); $colorCli = new ColorCLI(); diff --git a/misc/testing/nzb-import.php b/misc/testing/nzb-import.php index 7754b7b64..00fd5b49c 100644 --- a/misc/testing/nzb-import.php +++ b/misc/testing/nzb-import.php @@ -3,6 +3,7 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\NZBImport; +use Illuminate\Support\Str; $n = PHP_EOL; diff --git a/misc/update/tmux/run.php b/misc/update/tmux/run.php index b6c717b6b..94528d9be 100644 --- a/misc/update/tmux/run.php +++ b/misc/update/tmux/run.php @@ -6,6 +6,7 @@ use App\Models\Collection; use App\Models\Settings; use Blacklight\ColorCLI; use Illuminate\Support\Facades\Process; +use Illuminate\Support\Facades\DB; $tmuxPath = base_path().'/misc/update/tmux/'; $import = Settings::settingValue('site.tmux.import') ?? 0;