From 213014ca485395092d98a2aaae4b603e2ed40544 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 21 Apr 2023 22:34:55 +0200 Subject: [PATCH] CS fixes --- Blacklight/AniDB.php | 8 +-- Blacklight/Books.php | 6 +- Blacklight/ManticoreSearch.php | 10 ++-- Blacklight/processing/Videos.php | 18 +++--- .../Commands/NntmuxPopulateSearchIndexes.php | 56 +++++++++---------- app/Models/Release.php | 34 +++++------ app/Providers/RouteServiceProvider.php | 6 +- ..._100000_create_telescope_entries_table.php | 6 +- 8 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Blacklight/AniDB.php b/Blacklight/AniDB.php index f4223badc..b924c0e7d 100755 --- a/Blacklight/AniDB.php +++ b/Blacklight/AniDB.php @@ -118,10 +118,10 @@ class AniDB $query->where('at.title', 'like', '%'.$animeTitle.'%'); } $query->select(['at.anidbid', DB::raw("GROUP_CONCAT(at.title SEPARATOR ', ') AS title"), 'ai.description']) - ->from('anidb_titles as at') - ->leftJoin('anidb_info as ai', 'ai.anidbid', '=', 'at.anidbid') - ->groupBy('at.anidbid') - ->orderByDesc('at.anidbid'); + ->from('anidb_titles as at') + ->leftJoin('anidb_info as ai', 'ai.anidbid', '=', 'at.anidbid') + ->groupBy('at.anidbid') + ->orderByDesc('at.anidbid'); return $query->paginate(config('nntmux.items_per_page')); } diff --git a/Blacklight/Books.php b/Blacklight/Books.php index e255da94d..259a26b43 100755 --- a/Blacklight/Books.php +++ b/Blacklight/Books.php @@ -268,9 +268,9 @@ class Books Release::query()->where('nzbstatus', '=', NZB::NZB_ADDED) ->whereNull('bookinfo_id') ->whereIn('categories_id', [$iValue]) - ->orderByDesc('postdate') - ->limit($this->bookqty) - ->get(['searchname', 'id', 'categories_id']), $iValue + ->orderByDesc('postdate') + ->limit($this->bookqty) + ->get(['searchname', 'id', 'categories_id']), $iValue ); } } diff --git a/Blacklight/ManticoreSearch.php b/Blacklight/ManticoreSearch.php index 0eccdeae4..51f14664b 100644 --- a/Blacklight/ManticoreSearch.php +++ b/Blacklight/ManticoreSearch.php @@ -136,11 +136,11 @@ class ManticoreSearch public function updateRelease(int|string $releaseID): void { $new = Release::query() - ->where('releases.id', $releaseID) - ->leftJoin('release_files as rf', 'releases.id', '=', 'rf.releases_id') - ->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', DB::raw('IFNULL(GROUP_CONCAT(rf.name SEPARATOR " "),"") filename')]) - ->groupBy('releases.id') - ->first(); + ->where('releases.id', $releaseID) + ->leftJoin('release_files as rf', 'releases.id', '=', 'rf.releases_id') + ->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', DB::raw('IFNULL(GROUP_CONCAT(rf.name SEPARATOR " "),"") filename')]) + ->groupBy('releases.id') + ->first(); if ($new !== null) { $release = $new->toArray(); diff --git a/Blacklight/processing/Videos.php b/Blacklight/processing/Videos.php index a66ddc6ea..5d7cc3796 100755 --- a/Blacklight/processing/Videos.php +++ b/Blacklight/processing/Videos.php @@ -257,17 +257,17 @@ abstract class Videos if (! empty($title)) { if ($source > 0) { $query = Video::query() - ->whereRaw("REPLACE(title,'\'','') = ?", $title) - ->orWhereRaw("REPLACE(title,':','') = ?", $title) - ->where('type', '=', $type) - ->where('source', '=', $source) - ->first(); + ->whereRaw("REPLACE(title,'\'','') = ?", $title) + ->orWhereRaw("REPLACE(title,':','') = ?", $title) + ->where('type', '=', $type) + ->where('source', '=', $source) + ->first(); } else { $query = Video::query() - ->whereRaw("REPLACE(title,'\'','') = ?", $title) - ->orWhereRaw("REPLACE(title,':','') = ?", $title) - ->where('type', '=', $type) - ->first(); + ->whereRaw("REPLACE(title,'\'','') = ?", $title) + ->orWhereRaw("REPLACE(title,':','') = ?", $title) + ->where('type', '=', $type) + ->first(); } if (! empty($query)) { $result = $query->toArray(); diff --git a/app/Console/Commands/NntmuxPopulateSearchIndexes.php b/app/Console/Commands/NntmuxPopulateSearchIndexes.php index eee8cd7cd..829655aed 100644 --- a/app/Console/Commands/NntmuxPopulateSearchIndexes.php +++ b/app/Console/Commands/NntmuxPopulateSearchIndexes.php @@ -164,34 +164,34 @@ class NntmuxPopulateSearchIndexes extends Command DB::statement('SET SESSION group_concat_max_len=16384;'); Release::query() - ->orderByDesc('id') - ->leftJoin('release_files', 'releases.id', '=', 'release_files.releases_id') - ->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', 'releases.postdate']) - ->selectRaw('IFNULL(GROUP_CONCAT(release_files.name SEPARATOR " "),"") filename') - ->groupBy('id') - ->chunk($max, function ($releases) use ($bar, $data) { - foreach ($releases as $r) { - $searchName = str_replace(['.', '-'], ' ', $r->searchname); - $data['body'][] = [ - 'index' => [ - '_index' => 'releases', - '_id' => $r->id, - ], - ]; - $data['body'][] = [ - 'id' => $r->id, - 'name' => $r->name, - 'searchname' => $r->searchname, - 'plainsearchname' => $searchName, - 'fromname' => $r->fromname, - 'categories_id' => $r->categories_id, - 'filename' => $r->filename, - 'postdate' => $r->postdate, - ]; - $bar->advance(); - } - \Elasticsearch::bulk($data); - }); + ->orderByDesc('id') + ->leftJoin('release_files', 'releases.id', '=', 'release_files.releases_id') + ->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', 'releases.postdate']) + ->selectRaw('IFNULL(GROUP_CONCAT(release_files.name SEPARATOR " "),"") filename') + ->groupBy('id') + ->chunk($max, function ($releases) use ($bar, $data) { + foreach ($releases as $r) { + $searchName = str_replace(['.', '-'], ' ', $r->searchname); + $data['body'][] = [ + 'index' => [ + '_index' => 'releases', + '_id' => $r->id, + ], + ]; + $data['body'][] = [ + 'id' => $r->id, + 'name' => $r->name, + 'searchname' => $r->searchname, + 'plainsearchname' => $searchName, + 'fromname' => $r->fromname, + 'categories_id' => $r->categories_id, + 'filename' => $r->filename, + 'postdate' => $r->postdate, + ]; + $bar->advance(); + } + \Elasticsearch::bulk($data); + }); $bar->finish(); $this->newLine(); $this->info('Done'); diff --git a/app/Models/Release.php b/app/Models/Release.php index 5f2e1e908..5f5166125 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -427,23 +427,23 @@ class Release extends Model } $releases = self::query() - ->where('nzbstatus', '=', NZB::NZB_ADDED) - ->select( - [ - 'releases.id', - 'releases.name', - 'releases.searchname', - 'releases.size', - 'releases.guid', - 'releases.totalpart', - 'releases.postdate', - 'releases.adddate', - 'releases.grabs', - 'cp.title as parent_category', - 'c.title as sub_category', - DB::raw('CONCAT(cp.title, ' > ', c.title) AS category_name'), - ] - ) + ->where('nzbstatus', '=', NZB::NZB_ADDED) + ->select( + [ + 'releases.id', + 'releases.name', + 'releases.searchname', + 'releases.size', + 'releases.guid', + 'releases.totalpart', + 'releases.postdate', + 'releases.adddate', + 'releases.grabs', + 'cp.title as parent_category', + 'c.title as sub_category', + DB::raw('CONCAT(cp.title, ' > ', c.title) AS category_name'), + ] + ) ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') ->orderByDesc('releases.postdate') diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 9b6d8a924..20ddd4c8b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider protected function mapWebRoutes(): void { Route::middleware('web') - ->group(base_path('routes/web.php')); + ->group(base_path('routes/web.php')); } /** @@ -50,8 +50,8 @@ class RouteServiceProvider extends ServiceProvider protected function mapApiRoutes(): void { Route::prefix('api') - ->middleware('api') - ->group(base_path('routes/api.php')); + ->middleware('api') + ->group(base_path('routes/api.php')); } /** diff --git a/database/migrations/2018_08_08_100000_create_telescope_entries_table.php b/database/migrations/2018_08_08_100000_create_telescope_entries_table.php index 574e04575..18c77eec9 100644 --- a/database/migrations/2018_08_08_100000_create_telescope_entries_table.php +++ b/database/migrations/2018_08_08_100000_create_telescope_entries_table.php @@ -53,9 +53,9 @@ class CreateTelescopeEntriesTable extends Migration $table->index('tag'); $table->foreign('entry_uuid') - ->references('uuid') - ->on('telescope_entries') - ->onDelete('cascade'); + ->references('uuid') + ->on('telescope_entries') + ->onDelete('cascade'); }); $this->schema->create('telescope_monitoring', function (Blueprint $table) {