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

Separate Blacklight/Releases into specific services

Browse Source
This commit is contained in:
DariusIII
2025-12-20 21:47:01 +01:00
parent a79f357173
commit 85b4904e6f
26 changed files with 1553 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BrowseController.php
+14 -10
View File
@@ -4,24 +4,30 @@ namespace App\Http\Controllers;
use App\Models\Category;
use App\Models\RootCategory;
use Blacklight\Releases;
use App\Services\Releases\ReleaseBrowseService;
use Illuminate\Http\Request;
class BrowseController extends BasePageController
{
private ReleaseBrowseService $releaseBrowseService;
public function __construct(ReleaseBrowseService $releaseBrowseService)
{
parent::__construct();
$this->releaseBrowseService = $releaseBrowseService;
}
/**
* @throws \Exception
*/
public function index(Request $request)
{
$releases = new Releases;
$ordering = $releases->getBrowseOrdering();
$ordering = $this->releaseBrowseService->getBrowseOrdering();
$orderBy = $request->has('ob') && ! empty($request->input('ob')) ? $request->input('ob') : '';
$page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1;
$offset = ($page - 1) * config('nntmux.items_per_page');
$rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, -1);
$rslt = $this->releaseBrowseService->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, -1);
$results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
// Build order by URLs
@@ -48,7 +54,6 @@ class BrowseController extends BasePageController
*/
public function show(Request $request, string $parentCategory, string $id = 'All')
{
$releases = new Releases;
$parentId = RootCategory::query()->where('title', $parentCategory)->value('id');
@@ -65,12 +70,12 @@ class BrowseController extends BasePageController
$catarray = [];
$catarray[] = $category;
$ordering = $releases->getBrowseOrdering();
$ordering = $this->releaseBrowseService->getBrowseOrdering();
$orderBy = $request->has('ob') && ! empty($request->input('ob')) ? $request->input('ob') : '';
$page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1;
$offset = ($page - 1) * config('nntmux.items_per_page');
$rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, $grp);
$rslt = $this->releaseBrowseService->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, $grp);
$results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
$covgroup = '';
@@ -139,12 +144,11 @@ class BrowseController extends BasePageController
*/
public function group(Request $request)
{
$releases = new Releases;
if ($request->has('g')) {
$group = $request->input('g');
$page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1;
$offset = ($page - 1) * config('nntmux.items_per_page');
$rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata->categoryexclusions, $group);
$rslt = $this->releaseBrowseService->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata->categoryexclusions, $group);
$results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
$this->viewData = array_merge($this->viewData, [