From b08c4d51143a9f5e9c8568d54128c355339a8a5a Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 13 Apr 2018 15:30:39 +0200 Subject: [PATCH] Update AdultController and XXX class --- Blacklight/XXX.php | 164 ++++++++--------------- Changelog | 1 + app/Http/Controllers/AdultController.php | 10 +- public/pages/xxx.php | 91 ------------- 4 files changed, 56 insertions(+), 210 deletions(-) delete mode 100644 public/pages/xxx.php diff --git a/Blacklight/XXX.php b/Blacklight/XXX.php index c7bebb450..a6a9ff4b5 100755 --- a/Blacklight/XXX.php +++ b/Blacklight/XXX.php @@ -115,137 +115,79 @@ class XXX /** * Get XXX releases with covers for xxx browse page. * - * @param $cat - * @param $start - * @param $num - * @param $orderBy - * @param $maxAge - * @param array $excludedCats * - * @return array + * @param $page + * @param $cat + * @param $orderBy + * @param array $excludedcats + * + * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed * @throws \Exception */ - public function getXXXRange($cat, $start, $num, $orderBy, $maxAge = -1, array $excludedCats = []): array + public function getXXXRange($page, $cat, $orderBy, array $excludedcats = []) { - $catsrch = ''; - if (\count($cat) > 0 && $cat[0] !== -1) { - $catsrch = Category::getCategorySearch($cat); - } - $order = $this->getXXXOrder($orderBy); - $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium')); - - $xxxmoviesSql = - sprintf( - " - SELECT SQL_CALC_FOUND_ROWS - xxx.id, - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id - FROM xxxinfo xxx - LEFT JOIN releases r ON xxx.id = r.xxxinfo_id - WHERE r.nzbstatus = 1 - AND xxx.title != '' - AND r.passwordstatus %s - %s %s %s %s - GROUP BY xxx.id - ORDER BY %s %s %s", - $this->showPasswords, - $this->getBrowseBy(), - $catsrch, - ( - $maxAge > 0 - ? 'AND r.postdate > NOW() - INTERVAL '.$maxAge.'DAY ' - : '' - ), - (\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), - $order[0], - $order[1], - ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start) - ); - - $xxxmoviesCache = Cache::get(md5($xxxmoviesSql)); - if ($xxxmoviesCache !== null) { - $xxxmovies = $xxxmoviesCache; - } else { - $xxxmovies = $this->pdo->queryCalc($xxxmoviesSql); - Cache::put(md5($xxxmoviesSql), $xxxmovies, $expiresAt); + $sql = Release::query()->selectRaw("GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, + GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, + GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, + GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, + GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, + GROUP_CONCAT(rn.releases_id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, + GROUP_CONCAT(g.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, + GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, + GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, + GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, + GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, + GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, + GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, + GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, + GROUP_CONCAT(cp.title, ' > ', c.title ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_catname") + ->select( + [ + 'xxx.*', + \Illuminate\Support\Facades\DB::raw('UNCOMPRESS(xxx.plot) AS plot'), + 'r.movieinfo_id', + 'g.name as group_name', + 'rn.releases_id as nfoid', + ] + ) + ->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('xxxinfo as xxx', 'xxx.id', '=', 'r.xxxinfo_id') + ->where('r.nzbstatus', '=', 1) + ->where('xxx.title', '!=', ''); + Releases::showPasswords($sql, true); + if (\count($excludedcats) > 0) { + $sql->whereNotIn('r.categories_id', $excludedcats); } - $xxxIDs = $releaseIDs = false; - - if (\is_array($xxxmovies['result'])) { - foreach ($xxxmovies['result'] as $xxx => $id) { - $xxxIDs[] = $id['id']; - $releaseIDs[] = $id['grp_release_id']; - } + if (\count($cat) > 0 && $cat[0] !== -1) { + Category::getCategorySearch($cat, $sql, true); } - $sql = sprintf( - " - SELECT - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, - GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') AS grp_rarinnerfilecount, - GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, - GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, - GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, - GROUP_CONCAT(rn.releases_id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, - GROUP_CONCAT(g.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, - GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, - GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, - GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, - GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, - GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, - GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, - GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, - GROUP_CONCAT(cp.title, ' > ', c.title ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_catname, - xxx.*, UNCOMPRESS(xxx.plot) AS plot, - g.name AS group_name, - rn.releases_id AS nfoid - FROM releases r - LEFT OUTER JOIN groups g ON g.id = r.groups_id - LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id - LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id - LEFT OUTER JOIN categories c ON c.id = r.categories_id - LEFT OUTER JOIN categories cp ON cp.id = c.parentid - INNER JOIN xxxinfo xxx ON xxx.id = r.xxxinfo_id - WHERE r.nzbstatus = 1 - AND xxx.id IN (%s) - AND xxx.title != '' - AND r.passwordstatus %s - %s %s %s %s - GROUP BY xxx.id - ORDER BY %s %s", - (\is_array($xxxIDs) ? implode(',', $xxxIDs) : -1), - $this->showPasswords, - $this->getBrowseBy(), - $catsrch, - ( - $maxAge > 0 - ? 'AND r.postdate > NOW() - INTERVAL '.$maxAge.'DAY ' - : '' - ), - (\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''), - $order[0], - $order[1] - ); - $return = Cache::get(md5($sql)); + $sql->groupBy('xxx.id') + ->orderBy($order[0], $order[1]); + + $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { return $return; } - $return = $this->pdo->query($sql); - if (! empty($return)) { - $return[0]['_totalcount'] = $xxxmovies['total'] ?? 0; - } + $return = $sql->paginate(config('nntmux.items_per_cover_page')); - Cache::put(md5($sql), $return, $expiresAt); + $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long')); + Cache::put(md5($page.implode('.', $cat).implode('.', $excludedcats)), $return, $expiresAt); return $return; } /** - * Get the order type the user requested on the movies page. + * Get the order type the user requested on the xxx page. * * @param $orderBy * diff --git a/Changelog b/Changelog index ea6c63986..1c0b7766c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-04-13 DariusIII + * Chg: Update AdultController and XXX class * Chg: Update used libraries * Chg: Add AdultController * Chg: Adjust queries in classes related to browsing diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index 282181c48..321926632 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -33,12 +33,12 @@ class AdultController extends BasePageController $this->smarty->assign('catlist', $mtmp); $this->smarty->assign('category', $category); - $offset = ($request->has('offset') && ctype_digit($request->input('offset'))) ? $request->input('offset') : 0; $ordering = $adult->getXXXOrdering(); $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : ''; $movies = []; - $results = $adult->getXXXRange($catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $this->userdata['categoryexclusions']); + $page = $request->has('page') ? $request->input('page') : 1; + $results = $adult->getXXXRange($page, $catarray, $orderby, $this->userdata['categoryexclusions']); foreach ($results as $result) { $result['genre'] = makeFieldLinks($result, 'genre', 'xxx'); $result['actors'] = makeFieldLinks($result, 'actors', 'xxx'); @@ -61,12 +61,6 @@ class AdultController extends BasePageController $browseby_link = '&title='.$title.'&actors='.$actors.'&director='.$director.'&genre='.$genre; - $this->smarty->assign('pagertotalitems', $results[0]['_totalcount'] ?? 0); - $this->smarty->assign('pageroffset', $offset); - $this->smarty->assign('pageritemsperpage', config('nntmux.items_per_cover_page')); - $this->smarty->assign('pagerquerybase', WWW_TOP.'/xxx?t='.$category.$browseby_link.'&ob='.$orderby.'&offset='); - $this->smarty->assign('pagerquerysuffix', '#results'); - $pager = $this->smarty->fetch('pager.tpl'); $this->smarty->assign('pager', $pager); diff --git a/public/pages/xxx.php b/public/pages/xxx.php deleted file mode 100644 index 7f7ef0db3..000000000 --- a/public/pages/xxx.php +++ /dev/null @@ -1,91 +0,0 @@ -show403(); -} - -$movie = new XXX(); - -$moviecats = Category::getChildren(Category::XXX_ROOT); -$mtmp = []; -foreach ($moviecats as $mcat) { - $mtmp[$mcat['id']] = $mcat; -} -$category = Category::XXX_ROOT; -if (request()->has('t') && array_key_exists(request()->input('t'), $mtmp)) { - $category = request()->input('t') + 0; -} -$catarray = []; -$catarray[] = $category; - -$page->smarty->assign('catlist', $mtmp); -$page->smarty->assign('category', $category); - -$offset = (request()->has('offset') && ctype_digit(request()->input('offset'))) ? request()->input('offset') : 0; -$ordering = $movie->getXXXOrdering(); -$orderby = request()->has('ob') && in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; - -$movies = []; -$results = $movie->getXXXRange($catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $page->userdata['categoryexclusions']); -foreach ($results as $result) { - $result['genre'] = makeFieldLinks($result, 'genre', 'xxx'); - $result['actors'] = makeFieldLinks($result, 'actors', 'xxx'); - $result['director'] = makeFieldLinks($result, 'director', 'xxx'); - $movies[] = $result; -} -$title = (request()->has('title') && ! empty(request()->input('title'))) ? stripslashes(request()->input('title')) : ''; -$page->smarty->assign('title', stripslashes($title)); - -$actors = (request()->has('actors') && ! empty(request()->input('actors'))) ? stripslashes(request()->input('actors')) : ''; -$page->smarty->assign('actors', $actors); - -$director = (request()->has('director') && ! empty(request()->input('director'))) ? stripslashes(request()->input('director')) : ''; -$page->smarty->assign('director', $director); - -$genres = $movie->getAllGenres(true); -$genre = (request()->has('genre') && in_array(request()->input('genre'), $genres, false)) ? request()->input('genre') : ''; -$page->smarty->assign('genres', $genres); -$page->smarty->assign('genre', $genre); - -$browseby_link = '&title='.$title.'&actors='.$actors.'&director='.$director.'&genre='.$genre; - -$page->smarty->assign('pagertotalitems', $results[0]['_totalcount'] ?? 0); -$page->smarty->assign('pageroffset', $offset); -$page->smarty->assign('pageritemsperpage', config('nntmux.items_per_cover_page')); -$page->smarty->assign('pagerquerybase', WWW_TOP.'/xxx?t='.$category.$browseby_link.'&ob='.$orderby.'&offset='); -$page->smarty->assign('pagerquerysuffix', '#results'); - -$pager = $page->smarty->fetch('pager.tpl'); -$page->smarty->assign('pager', $pager); - -if ((int) $category === -1) { - $page->smarty->assign('catname', 'All'); -} else { - $cdata = Category::find($category); - if ($cdata) { - $page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); - } else { - $page->show404(); - } -} - -foreach ($ordering as $ordertype) { - $page->smarty->assign('orderby'.$ordertype, WWW_TOP.'/xxx?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0'); -} - -$page->smarty->assign('results', $movies); - -$page->meta_title = 'Browse XXX'; -$page->meta_keywords = 'browse,xxx,nzb,description,details'; -$page->meta_description = 'Browse for XXX Movies'; - -if (request()->has('id')) { - $page->content = $page->smarty->fetch('viewxxxfull.tpl'); -} else { - $page->content = $page->smarty->fetch('xxx.tpl'); -} -$page->pagerender();