diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index c059285ff..e7ec8c4bf 100755 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -333,35 +333,6 @@ class Releases extends Release return $temp_array; } - /** - * Cache of concatenated category ID's used in queries. - * @var null|array - */ - private $concatenatedCategoryIDsCache = null; - - /** - * Gets / sets a string of concatenated category ID's used in queries. - * - * @return array|null|string - */ - public function getConcatenatedCategoryIDs() - { - if ($this->concatenatedCategoryIDsCache === null) { - $result = Category::query() - ->remember(config('nntmux.cache_expiry_long')) - ->whereNotNull('categories.root_categories_id') - ->whereNotNull('cp.id') - ->selectRaw('CONCAT(cp.id, ", ", categories.id) AS category_ids') - ->leftJoin('root_categories as cp', 'cp.id', '=', 'categories.root_categories_id') - ->get(); - if (isset($result[0]['category_ids'])) { - $this->concatenatedCategoryIDsCache = $result[0]['category_ids']; - } - } - - return $this->concatenatedCategoryIDsCache; - } - /** * Get TV for My Shows page. * @@ -380,7 +351,6 @@ class Releases extends Release $sql = sprintf( "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, r.jpgstatus, 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, rn.releases_id AS nfoid, re.releases_id AS reid, tve.firstaired, @@ -400,7 +370,6 @@ class Releases extends Release %s GROUP BY r.id ORDER BY %s %s %s", - $this->getConcatenatedCategoryIDs(), $this->uSQL($userShows, 'videos_id'), (\count($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), NZB::NZB_ADDED, @@ -636,7 +605,6 @@ class Releases extends Release $baseSql = sprintf( "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, r.jpgstatus, 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, g.name AS group_name, rn.releases_id AS nfoid, @@ -654,7 +622,6 @@ class Releases extends Release LEFT JOIN root_categories cp ON cp.id = c.root_categories_id LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id %s %s", - $this->getConcatenatedCategoryIDs(), ! empty($tags) ? ' LEFT JOIN tagging_tagged tt ON tt.taggable_id = r.id' : '', $whereSql ); @@ -723,7 +690,6 @@ class Releases extends Release $baseSql = sprintf( "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, r.jpgstatus, 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, cp.id AS categoryparentid, v.tvdb, v.trakt, v.tvrage, v.tvmaze, v.imdb, v.tmdb, @@ -736,7 +702,6 @@ class Releases extends Release LEFT JOIN categories c ON c.id = r.categories_id LEFT JOIN root_categories cp ON cp.id = c.root_categories_id %s %s", - $this->getConcatenatedCategoryIDs(), ! empty($tags) ? ' LEFT JOIN tagging_tagged tt ON tt.taggable_id = r.id' : '', $whereSql ); @@ -873,7 +838,6 @@ class Releases extends Release tvi.summary, tvi.publisher, tvi.image, tve.series, tve.episode, tve.se_complete, tve.title, tve.firstaired, tve.summary, 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, rn.releases_id AS nfoid, re.releases_id AS reid @@ -887,7 +851,6 @@ class Releases extends Release LEFT OUTER JOIN video_data re ON re.releases_id = r.id LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id %s %s", - $this->getConcatenatedCategoryIDs(), ! empty($tags) ? ' LEFT JOIN tagging_tagged tt ON tt.taggable_id = r.id' : '', $whereSql ); @@ -1016,7 +979,6 @@ class Releases extends Release 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, - %s AS category_ids, g.name AS group_name FROM releases r LEFT OUTER JOIN videos v ON r.videos_id = v.id AND v.type = 0 @@ -1026,7 +988,6 @@ class Releases extends Release LEFT JOIN root_categories cp ON cp.id = c.root_categories_id LEFT JOIN usenet_groups g ON g.id = r.groups_id %s %s", - $this->getConcatenatedCategoryIDs(), ! empty($tags) ? ' LEFT JOIN tagging_tagged tt ON tt.taggable_id = r.id' : '', $whereSql ); @@ -1089,7 +1050,6 @@ class Releases extends Release $baseSql = sprintf( "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, r.jpgstatus, 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, rn.releases_id AS nfoid, re.releases_id AS reid @@ -1100,7 +1060,6 @@ class Releases extends Release LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id LEFT OUTER JOIN releaseextrafull re ON re.releases_id = r.id %s", - $this->getConcatenatedCategoryIDs(), $whereSql ); $sql = sprintf( @@ -1168,7 +1127,6 @@ class Releases extends Release $baseSql = sprintf( "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, r.jpgstatus, 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, rn.releases_id AS nfoid FROM releases r @@ -1178,7 +1136,6 @@ class Releases extends Release LEFT JOIN root_categories cp ON cp.id = c.root_categories_id LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id %s %s", - $this->getConcatenatedCategoryIDs(), ! empty($tags) ? ' LEFT JOIN tagging_tagged tt ON tt.taggable_id = r.id' : '', $whereSql ); diff --git a/Blacklight/http/RSS.php b/Blacklight/http/RSS.php index c519decff..0dce28e11 100755 --- a/Blacklight/http/RSS.php +++ b/Blacklight/http/RSS.php @@ -80,8 +80,7 @@ class RSS extends Capabilities mug.title AS mu_genre, co.title AS co_title, co.url AS co_url, co.publisher AS co_publisher, co.releasedate AS co_releasedate, co.review AS co_review, co.cover AS co_cover, cog.title AS co_genre, - bo.cover AS bo_cover, - %s AS category_ids + bo.cover AS bo_cover FROM releases r LEFT JOIN categories c ON c.id = r.categories_id INNER JOIN root_categories cp ON cp.id = c.root_categories_id @@ -97,7 +96,6 @@ class RSS extends Capabilities AND r.nzbstatus = %d %s %s %s %s ORDER BY postdate DESC %s", - $this->releases->getConcatenatedCategoryIDs(), $cartSearch, $this->releases->showPasswords(), NZB::NZB_ADDED, @@ -135,7 +133,6 @@ class RSS extends Capabilities " 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, v.id, v.title, g.name AS group_name, CONCAT(cp.title, '-', c.title) AS category_name, - %s AS category_ids, COALESCE(cp.id,0) AS parentid FROM releases r LEFT JOIN categories c ON c.id = r.categories_id @@ -148,7 +145,6 @@ class RSS extends Capabilities AND r.categories_id BETWEEN %d AND %d AND r.passwordstatus %s ORDER BY postdate DESC %s", - $this->releases->getConcatenatedCategoryIDs(), $this->releases->uSQL( UserSerie::fromQuery( sprintf( @@ -199,7 +195,6 @@ class RSS extends Capabilities " 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, mi.title AS releasetitle, g.name AS group_name, CONCAT(cp.title, '-', c.title) AS category_name, - %s AS category_ids, COALESCE(cp.id,0) AS parentid FROM releases r LEFT JOIN categories c ON c.id = r.categories_id @@ -211,7 +206,6 @@ class RSS extends Capabilities AND r.categories_id BETWEEN %d AND %d AND r.passwordstatus %s ORDER BY postdate DESC %s", - $this->releases->getConcatenatedCategoryIDs(), $this->releases->uSQL( UserMovie::fromQuery( sprintf( diff --git a/Changelog b/Changelog index ce8af3c4d..a21c575f0 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-08-29 DariusIII + * Chg: Remove getConcatenatedCategoryIDs function * Chg: Remove rest of the rememberable trait usages 2019-08-28 DariusIII * Chg: Start removing watson/rememberable usage