From a5c6ef9ed4c035d6c0b9ae44ea86657e17235bb5 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 13 Apr 2018 14:46:31 +0200 Subject: [PATCH] Adjust queries in classes related to browsing --- Blacklight/Console.php | 15 ++++++++------- Blacklight/Games.php | 15 ++++++++------- Blacklight/Movie.php | 19 ++++++++++--------- Blacklight/Music.php | 15 ++++++++------- Changelog | 1 + app/Models/Category.php | 4 ++-- 6 files changed, 37 insertions(+), 32 deletions(-) diff --git a/Blacklight/Console.php b/Blacklight/Console.php index 73c848b13..8b7235e03 100755 --- a/Blacklight/Console.php +++ b/Blacklight/Console.php @@ -180,17 +180,18 @@ class Console 'rn.releases_id as nfoid', ] ) - ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') - ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') - ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') - ->join('consoleinfo as con', 'con.id', '=', 'releases.consoleinfo_id') + ->from('releases as r') + ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id') + ->join('consoleinfo as con', 'con.id', '=', 'r.consoleinfo_id') ->join('genres as gn', 'con.genres_id', '=', 'gn.id') - ->where('releases.nzbstatus', '=', 1) + ->where('r.nzbstatus', '=', 1) ->where('con.title', '!=', '') ->where('con.cover', '=', 1); Releases::showPasswords($sql, true); if (\count($excludedcats) > 0) { - $sql->whereNotIn('releases.categories_id', $excludedcats); + $sql->whereNotIn('r.categories_id', $excludedcats); } if (\count($cat) > 0 && $cat[0] !== -1) { @@ -198,7 +199,7 @@ class Console } $sql->groupBy('con.id') - ->orderBy('releases.postdate', 'desc'); + ->orderBy('r.postdate', 'desc'); $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { diff --git a/Blacklight/Games.php b/Blacklight/Games.php index 98e343b5f..e5701e69a 100755 --- a/Blacklight/Games.php +++ b/Blacklight/Games.php @@ -249,17 +249,18 @@ class Games 'rn.releases_id as nfoid', ] ) - ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') - ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') - ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') - ->join('gamesinfo as gi', 'gi.id', '=', 'releases.gamesinfo_id') + ->from('releases as r') + ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id') + ->join('gamesinfo as gi', 'gi.id', '=', 'r.gamesinfo_id') ->join('genres as gn', 'gi.genres_id', '=', 'gn.id') - ->where('releases.nzbstatus', '=', 1) + ->where('r.nzbstatus', '=', 1) ->where('gi.title', '!=', '') ->where('gi.cover', '=', 1); Releases::showPasswords($sql, true); if (\count($excludedcats) > 0) { - $sql->whereNotIn('releases.categories_id', $excludedcats); + $sql->whereNotIn('r.categories_id', $excludedcats); } if (\count($cat) > 0 && $cat[0] !== -1) { @@ -267,7 +268,7 @@ class Games } $sql->groupBy('gi.id') - ->orderBy('releases.postdate', 'desc'); + ->orderBy('r.postdate', 'desc'); $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { diff --git a/Blacklight/Movie.php b/Blacklight/Movie.php index 9f9f4ff52..59b1a3dac 100755 --- a/Blacklight/Movie.php +++ b/Blacklight/Movie.php @@ -245,23 +245,24 @@ class Movie ->select( [ 'm.*', - 'releases.movieinfo_id', + 'r.movieinfo_id', 'g.name as group_name', 'rn.releases_id as nfoid', ] ) - ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') - ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') - ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') - ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') + ->from('releases as r') + ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id') + ->leftJoin('categories as c', 'c.id', '=', 'r.categories_id') ->leftJoin('categories as cp', 'cp.id', '=', 'c.parentid') - ->join('movieinfo as m', 'm.imdbid', '=', 'releases.imdbid') - ->where('releases.nzbstatus', '=', 1) + ->join('movieinfo as m', 'm.imdbid', '=', 'r.imdbid') + ->where('r.nzbstatus', '=', 1) ->where('m.title', '!=', '') ->where('m.imdbid', '!=', '0000000'); Releases::showPasswords($sql, true); if (\count($excludedcats) > 0) { - $sql->whereNotIn('releases.categories_id', $excludedcats); + $sql->whereNotIn('r.categories_id', $excludedcats); } if (\count($cat) > 0 && $cat[0] !== -1) { @@ -269,7 +270,7 @@ class Movie } $sql->groupBy('m.imdbid') - ->orderBy('releases.postdate', 'desc'); + ->orderBy('r.postdate', 'desc'); $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { diff --git a/Blacklight/Music.php b/Blacklight/Music.php index e0fd8f7d9..84f40b9bb 100755 --- a/Blacklight/Music.php +++ b/Blacklight/Music.php @@ -170,17 +170,18 @@ class Music 'rn.releases_id as nfoid', ] ) - ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') - ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') - ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') - ->join('musicinfo as m', 'm.id', '=', 'releases.musicinfo_id') + ->from('releases as r') + ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id') + ->join('musicinfo as m', 'm.id', '=', 'r.musicinfo_id') ->join('genres as gn', 'm.genres_id', '=', 'gn.id') - ->where('releases.nzbstatus', '=', 1) + ->where('r.nzbstatus', '=', 1) ->where('m.title', '!=', '') ->where('m.cover', '=', 1); Releases::showPasswords($sql, true); if (\count($excludedcats) > 0) { - $sql->whereNotIn('releases.categories_id', $excludedcats); + $sql->whereNotIn('r.categories_id', $excludedcats); } if (\count($cat) > 0 && $cat[0] !== -1) { @@ -188,7 +189,7 @@ class Music } $sql->groupBy('m.id') - ->orderBy('releases.postdate', 'desc'); + ->orderBy('r.postdate', 'desc'); $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { diff --git a/Changelog b/Changelog index efc2eaf41..a16f13993 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-04-13 DariusIII + * Chg: Adjust queries in classes related to browsing * Chg: Update redirect on new rss key generation * Chg: Add option to edit profile to ProfileController * Chg: Add MyShowsController, adjust rest of the controllers and classes diff --git a/app/Models/Category.php b/app/Models/Category.php index 045e00c90..7e4f5bc53 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -234,7 +234,7 @@ class Category extends Model if ($builder === false) { $catsrch = $categories[0] !== -1 ? ' AND releases.categories_id = '.$categories[0] : ''; } else { - $catsrch = $query->where('releases.categories_id', '=', $categories[0]); + $catsrch = $query->where('r.categories_id', '=', $categories[0]); } break; // Multiple category constraints @@ -242,7 +242,7 @@ class Category extends Model if ($builder === false) { $catsrch = ' AND releases.categories_id IN ('.implode(', ', $categories).') '; } else { - $catsrch = $query->whereIn('releases.categories_id', $categories); + $catsrch = $query->whereIn('r.categories_id', $categories); } break; }