From 049b26ab5f65cef9946689e08dfc1dafb14a3a27 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 13 Mar 2019 23:08:49 +0100 Subject: [PATCH] Update messed up browsing --- Blacklight/Releases.php | 22 +++++++++++----------- Changelog | 1 + app/Http/Controllers/BrowseController.php | 12 ++++++------ routes/web.php | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index f2fdfa331..afb73c0c0 100755 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -66,7 +66,7 @@ class Releases extends Release $orderBy = $this->getBrowseOrder($orderBy); $qry = sprintf( - "SELECT r.id, r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.id, r.searchname, r.groups_id, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, ' > ', c.title) AS category_name, CONCAT(cp.id, ',', c.id) AS category_ids, df.failed AS failed, @@ -76,7 +76,7 @@ class Releases extends Release tve.title, tve.firstaired FROM ( - SELECT r.id, r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, g.name AS group_name + SELECT r.id, r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, g.name AS group_name FROM releases r LEFT JOIN usenet_groups g ON g.id = r.groups_id %s @@ -385,16 +385,16 @@ class Releases extends Release { $orderBy = $this->getBrowseOrder($orderBy); $sql = sprintf( - "SELECT r.id, r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.id, r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, '-', c.title) AS category_name, %s AS category_ids, - usenet_groups.name AS group_name, + g.name AS group_name, rn.releases_id AS nfoid, re.releases_id AS reid, tve.firstaired, df.failed AS failed FROM releases r LEFT OUTER JOIN video_data re ON re.releases_id = r.id - LEFT JOIN usenet_groups ON usenet_groups.id = r.groups_id + LEFT JOIN usenet_groups g ON g.id = r.groups_id LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id LEFT OUTER JOIN tv_episodes tve ON tve.videos_id = r.videos_id LEFT JOIN categories c ON c.id = r.categories_id @@ -641,7 +641,7 @@ class Releases extends Release ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '') ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, ' > ', c.title) AS category_name, %s AS category_ids, df.failed AS failed, @@ -728,7 +728,7 @@ class Releases extends Release ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '') ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, m.imdbid, m.tmdbid, m.traktid, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, m.imdbid, m.tmdbid, m.traktid, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, ' > ', c.title) AS category_name, %s AS category_ids, g.name AS group_name, @@ -874,7 +874,7 @@ class Releases extends Release ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, + "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, v.title, v.countries_id, v.started, v.tvdb, v.trakt, v.imdb, v.tmdb, v.tvmaze, v.tvrage, v.source, tvi.summary, tvi.publisher, tvi.image, @@ -1019,7 +1019,7 @@ class Releases extends Release ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '' ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.tv_episodes_id, + "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.tv_episodes_id, r.haspreview, v.title, v.type, v.tvdb, v.trakt,v.imdb, v.tmdb, v.tvmaze, v.tvrage, tve.series, tve.episode, tve.se_complete, tve.title, tve.firstaired, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, ' > ', c.title) AS category_name, @@ -1094,7 +1094,7 @@ class Releases extends Release ($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '') ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.id, r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.haspreview, cp.title AS parent_category, c.title AS sub_category, CONCAT(cp.title, ' > ', c.title) AS category_name, %s AS category_ids, g.name AS group_name, @@ -1173,7 +1173,7 @@ class Releases extends Release $minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '' ); $baseSql = sprintf( - "SELECT r.searchname, r.guid, r.postdate, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.imdbid, r.videos_id, r.tv_episodes_id, m.imdbid, m.tmdbid, m.traktid, cp.title AS parent_category, c.title AS sub_category, + "SELECT r.id, r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.imdbid, r.videos_id, r.tv_episodes_id, r.haspreview, m.imdbid, m.tmdbid, m.traktid, cp.title AS parent_category, c.title AS sub_category, concat(cp.title, ' > ', c.title) AS category_name, %s AS category_ids, g.name AS group_name, diff --git a/Changelog b/Changelog index 434a4ae67..f43a42faa 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-03-13 DariusIII + * Chg: Update messed up browsing * Chg: Select only needed columns from releases table * Chg: Update deleteReleases function query in ProcessReleases class * Chg: Change check for giantbomb key diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 4b7a987a6..c4d88589c 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -108,17 +108,17 @@ class BrowseController extends BasePageController } elseif ($category !== -1 && $grp === -1) { $cdata = Category::find($category['id']); if ($cdata !== null) { - if ($cdata->root_categories_id === Category::GAME_ROOT || $cdata->id === Category::GAME_ROOT) { + if ($cdata->root_categories_id === Category::GAME_ROOT) { $covgroup = 'console'; - } elseif ($cdata->root_categories_id === Category::MOVIE_ROOT || $cdata->id === Category::MOVIE_ROOT) { + } elseif ($cdata->root_categories_id === Category::MOVIE_ROOT) { $covgroup = 'movies'; - } elseif ($cdata->root_categories_id === Category::XXX_ROOT || $cdata->id === Category::XXX_ROOT) { + } elseif ($cdata->root_categories_id === Category::XXX_ROOT) { $covgroup = 'xxx'; - } elseif ($cdata->root_categories_id === Category::PC_ROOT || $cdata->id === Category::PC_GAMES) { + } elseif ($cdata->root_categories_id === Category::PC_ROOT) { $covgroup = 'games'; - } elseif ($cdata->root_categories_id === Category::MUSIC_ROOT || $cdata->id === Category::MUSIC_ROOT) { + } elseif ($cdata->root_categories_id === Category::MUSIC_ROOT) { $covgroup = 'music'; - } elseif ($cdata->root_categories_id === Category::BOOKS_ROOT || $cdata->id === Category::BOOKS_ROOT) { + } elseif ($cdata->root_categories_id === Category::BOOKS_ROOT) { $covgroup = 'books'; } } diff --git a/routes/web.php b/routes/web.php index 7ed49cf6e..0cad58e0c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -38,7 +38,7 @@ Route::group(['middleware' => ['isVerified', 'fw-block-blacklisted']], function Route::group(['prefix' => 'browse'], function () { Route::get('tags', 'BrowseController@tags'); Route::get('group', 'BrowseController@group'); - Route::get('all', 'BrowseController@index'); + Route::get('All', 'BrowseController@index'); Route::get('{parentCategory}/{id?}', 'BrowseController@show')->middleware('clearance'); });