starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MusicController

Browse Source
This commit is contained in:
DariusIII
2018-04-11 15:38:01 +02:00
parent 5c03d71762
commit 8a0eeb61ee
6 changed files with 152 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/Movie.php
+1 -1
View File
@@ -245,7 +245,7 @@ class Movie
->select(
[
'm.*',
'releases.gamesinfo_id',
'releases.movieinfo_id',
'g.name as group_name',
'rn.releases_id as nfoid',
]
Blacklight/Music.php
+46 -98
View File
@@ -138,119 +138,67 @@ class Music
}
/**
* @param $page
* @param $cat
* @param $start
* @param $num
* @param $orderby
* @param array $excludedcats
*
* @return array
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed
* @throws \Exception
*/
public function getMusicRange($cat, $start, $num, $orderby, array $excludedcats = [])
public function getMusicRange($page, $cat, array $excludedcats = [])
{
$browseby = $this->getBrowseBy();
$catsrch = '';
if (\count($cat) > 0 && (int) $cat[0] !== -1) {
$catsrch = Category::getCategorySearch($cat);
}
$exccatlist = '';
$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")
->select(
[
'm.*',
'releases.musicinfo_id',
'g.name as group_name',
'gn.title as genre',
'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')
->join('genres as gn', 'm.genres_id', '=', 'gn.id')
->where('releases.nzbstatus', '=', 1)
->where('m.title', '!=', '')
->where('m.cover', '=', 1);
Releases::showPasswords($sql, true);
if (\count($excludedcats) > 0) {
$exccatlist = ' AND r.categories_id NOT IN ('.implode(',', $excludedcats).')';
$sql->whereNotIn('releases.categories_id', $excludedcats);
}
$order = $this->getMusicOrder($orderby);
$expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
$musicSql =
sprintf(
"
SELECT SQL_CALC_FOUND_ROWS
m.id,
GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
FROM musicinfo m
LEFT JOIN releases r ON r.musicinfo_id = m.id
WHERE r.nzbstatus = 1
AND m.title != ''
AND m.cover = 1
AND r.passwordstatus %s
%s %s %s
GROUP BY m.id
ORDER BY %s %s %s",
Releases::showPasswords(),
$browseby,
$catsrch,
$exccatlist,
$order[0],
$order[1],
($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start)
);
$musicCache = Cache::get(md5($musicSql));
if ($musicCache !== null) {
$music = $musicCache;
} else {
$music = $this->pdo->queryCalc($musicSql);
Cache::put(md5($musicSql), $music, $expiresAt);
if (\count($cat) > 0 && $cat[0] !== -1) {
Category::getCategorySearch($cat, $sql, true);
}
$musicIDs = $releaseIDs = false;
$sql->groupBy('m.id')
->orderBy('releases.postdate', 'desc');
if (\is_array($music['result'])) {
foreach ($music['result'] as $mus => $id) {
$musicIDs[] = $id['id'];
$releaseIDs[] = $id['grp_release_id'];
}
}
$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,
m.*,
r.musicinfo_id, r.haspreview,
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
INNER JOIN musicinfo m ON m.id = r.musicinfo_id
WHERE m.id IN (%s)
AND r.id IN (%s)
%s
GROUP BY m.id
ORDER BY %s %s",
(\is_array($musicIDs) ? implode(',', $musicIDs) : -1),
(\is_array($releaseIDs) ? implode(',', $releaseIDs) : -1),
$catsrch,
$order[0],
$order[1]
);
$return = Cache::get(md5($sql));
$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'] = $music['total'] ?? 0;
}
Cache::put(md5($sql), $return, $expiresAt);
$return = $sql->paginate(config('nntmux.items_per_cover_page'));
$expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long'));
Cache::put(md5($page.implode('.', $cat).implode('.', $excludedcats)), $return, $expiresAt);
return $return;
}
Changelog
+2 -1
View File
@@ -1,5 +1,6 @@
2018-04-11 DariusIII
* Chg: Fix missing release_flag frtom smarty, update themes
* Chg: Add MusicController
* Chg: Fix missing release_flag from smarty, update themes
* Chg: Add MovieController
* Chg: Add GamesController, adjust themes and classes
* Chg: Update CartController
app/Http/Controllers/MusicController.php
+100
View File
@@ -0,0 +1,100 @@
<?php
namespace App\Http\Controllers;
use App\Models\Category;
use Blacklight\Genres;
use Blacklight\Music;
use Illuminate\Http\Request;
class MusicController extends BasePageController
{
/**
* @param \Illuminate\Http\Request $request
*
* @throws \Exception
*/
public function show(Request $request)
{
$music = new Music(['Settings' => $this->settings]);
$gen = new Genres(['Settings' => $this->settings]);
$musiccats = Category::getChildren(Category::MUSIC_ROOT);
$mtmp = [];
foreach ($musiccats as $mcat) {
$mtmp[$mcat['id']] = $mcat;
}
$category = Category::MUSIC_ROOT;
if ($request->has('t') && array_key_exists($request->input('t'), $mtmp)) {
$category = $request->input('t') + 0;
}
$catarray = [];
$catarray[] = $category;
$this->smarty->assign('catlist', $mtmp);
$this->smarty->assign('category', $category);
$page = $request->has('page') ? $request->input('page') : 1;
$musics = [];
$results = $music->getMusicRange($page, $catarray, $this->userdata['categoryexclusions']);
$artist = ($request->has('artist') && ! empty($request->input('artist'))) ? stripslashes($request->input('artist')) : '';
$this->smarty->assign('artist', $artist);
$title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : '';
$this->smarty->assign('title', $title);
$genres = $gen->getGenres(Genres::MUSIC_TYPE, true);
$tmpgnr = [];
foreach ($genres as $gn) {
$tmpgnr[$gn['id']] = $gn['title'];
}
foreach ($results as $result) {
$result['genre'] = $tmpgnr[$result['genres_id']];
$musics[] = $result;
}
$genre = ($request->has('genre') && array_key_exists($request->input('genre'), $tmpgnr)) ? $request->input('genre') : '';
$this->smarty->assign('genres', $genres);
$this->smarty->assign('genre', $genre);
$years = range(1950, date('Y') + 1);
rsort($years);
$year = ($request->has('year') && \in_array($request->input('year'), $years, false)) ? $request->input('year') : '';
$this->smarty->assign('years', $years);
$this->smarty->assign('year', $year);
if ((int) $category === -1) {
$this->smarty->assign('catname', 'All');
} else {
$cdata = Category::find($category);
if ($cdata) {
$this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
$this->show404();
}
}
$this->smarty->assign('results', $musics);
$meta_title = 'Browse Albums';
$meta_keywords = 'browse,nzb,albums,description,details';
$meta_description = 'Browse for Albums';
$content = $this->smarty->fetch('music.tpl');
$this->smarty->assign(
[
'content' => $content,
'meta_title' => $meta_title,
'meta_keywords' => $meta_keywords,
'meta_description' => $meta_description,
]
);
$this->pagerender();
}
}
public/pages/music.php
-98
View File
@@ -1,98 +0,0 @@
<?php
use Blacklight\Music;
use Blacklight\Genres;
use App\Models\Category;
use Illuminate\Support\Facades\Auth;
if (! Auth::check()) {
$page->show403();
}
$music = new Music(['Settings' => $page->settings]);
$gen = new Genres(['Settings' => $page->settings]);
$musiccats = Category::getChildren(Category::MUSIC_ROOT);
$mtmp = [];
foreach ($musiccats as $mcat) {
$mtmp[$mcat['id']] = $mcat;
}
$category = Category::MUSIC_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 = $music->getMusicOrdering();
$orderby = request()->has('ob') && in_array(request()->input('ob'), $ordering) ? request()->input('ob') : '';
$musics = [];
$results = $music->getMusicRange($catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $page->userdata['categoryexclusions']);
$artist = (request()->has('artist') && ! empty(request()->input('artist'))) ? stripslashes(request()->input('artist')) : '';
$page->smarty->assign('artist', $artist);
$title = (request()->has('title') && ! empty(request()->input('title'))) ? stripslashes(request()->input('title')) : '';
$page->smarty->assign('title', $title);
$genres = $gen->getGenres(Genres::MUSIC_TYPE, true);
$tmpgnr = [];
foreach ($genres as $gn) {
$tmpgnr[$gn['id']] = $gn['title'];
}
foreach ($results as $result) {
$result['genre'] = $tmpgnr[$result['genres_id']];
$musics[] = $result;
}
$genre = (request()->has('genre') && array_key_exists(request()->input('genre'), $tmpgnr)) ? request()->input('genre') : '';
$page->smarty->assign('genres', $genres);
$page->smarty->assign('genre', $genre);
$years = range(1950, date('Y') + 1);
rsort($years);
$year = (request()->has('year') && in_array(request()->input('year'), $years, false)) ? request()->input('year') : '';
$page->smarty->assign('years', $years);
$page->smarty->assign('year', $year);
$browseby_link = '&amp;title='.$title.'&amp;artist='.$artist.'&amp;genre='.$genre.'&amp;year='.$year;
$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.'/music?t='.$category.$browseby_link.'&amp;ob='.$orderby.'&amp;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.'/music?t='.$category.$browseby_link.'&amp;ob='.$ordertype.'&amp;offset=0');
}
$page->smarty->assign('results', $musics);
$page->meta_title = 'Browse Albums';
$page->meta_keywords = 'browse,nzb,albums,description,details';
$page->meta_description = 'Browse for Albums';
$page->content = $page->smarty->fetch('music.tpl');
$page->pagerender();
routes/web.php
+3 -3
View File
@@ -98,9 +98,9 @@ Route::get('/pc', function () {
redirect('/pc');
})->middleware('auth');
Route::get('/music', function () {
redirect('/music');
})->middleware('auth');
Route::get('music', 'MusicController@show');
Route::post('music', 'MusicController@show');
Route::get('/xxx', function () {
redirect('/xxx');