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

Revert "Revert "Use flexible caching""

Browse Source 
This reverts commit d235cc41d4.
This commit is contained in:
DariusIII
2024-09-13 22:24:00 +02:00
parent 2e53ceb2f7
commit 206b514608
6 changed files with 51 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/Books.php
+10 -11
View File
@@ -102,7 +102,7 @@ class Books
return BookInfo::search($searchWords)->first();
}
public function getBookRange($page, $cat, $start, $num, $orderBy, array $excludedCats = []): array
public function getBookRange($page, $cat, $start, $num, $orderBy, array $excludedCats = []): mixed
{
$browseby = $this->getBrowseBy();
$catsrch = '';
@@ -175,17 +175,16 @@ class Books
$order[0],
$order[1]
);
$return = Cache::get(md5($sql.$page));
if ($return !== null) {
return $return;
}
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $books['total'][0]->total ?? 0;
}
Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
return Cache::flexible($sql.$page, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql, $books) {
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $books['total'][0]->total ?? 0;
}
return $return;
});
}
public function getBookOrder($orderBy): array
Blacklight/Console.php
+9 -15
View File
@@ -132,10 +132,7 @@ class Console
return ConsoleInfo::search($searchWords)->first() ?? false;
}
/**
* @throws \Exception
*/
public function getConsoleRange($page, $cat, $start, $num, $orderBy, array $excludedCats = []): array
public function getConsoleRange($page, $cat, $start, $num, $orderBy, array $excludedCats = []): mixed
{
$browseBy = $this->getBrowseBy();
$catsrch = '';
@@ -211,18 +208,15 @@ class Console
$order[0],
$order[1]
);
$return = Cache::get(md5($sql.$page));
if ($return !== null) {
return $return;
}
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $consoles['total'][0]->total ?? 0;
}
$expiresAt = now()->addMinutes(config('nntmux.cache_expiry_long'));
Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
return Cache::flexible($sql.$page, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql, $consoles) {
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $consoles['total'][0]->total ?? 0;
}
return $return;
});
}
public function getConsoleOrder($orderBy): array
Blacklight/Games.php
+9 -14
View File
@@ -163,10 +163,7 @@ class Games
return $res ?? 0;
}
/**
* @throws \Exception
*/
public function getGamesRange($page, $cat, $start, $num, array|string $orderBy = '', string $maxAge = '', array $excludedCats = []): array
public function getGamesRange($page, $cat, $start, $num, array|string $orderBy = '', string $maxAge = '', array $excludedCats = []): mixed
{
$browseBy = $this->getBrowseBy();
$catsrch = '';
@@ -243,17 +240,15 @@ class Games
$order[0],
$order[1]
);
$return = Cache::get(md5($returnSql.$page));
if ($return !== null) {
return $return;
}
$return = DB::select($returnSql);
if (\count($return) > 0) {
$return[0]->_totalcount = $games['total'][0]->total ?? 0;
}
Cache::put(md5($returnSql.$page), $return, $expiresAt);
return $return;
return Cache::flexible($returnSql.$page, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($returnSql, $games) {
$return = DB::select($returnSql);
if (\count($return) > 0) {
$return[0]->_totalcount = $games['total'][0]->total ?? 0;
}
return $return;
});
}
public function getGamesOrder(array|string $orderBy): array
Blacklight/Genres.php
+7 -22
View File
@@ -25,21 +25,13 @@ class Genres
public function __construct() {}
/**
* @return array|mixed
*/
public function getGenres(string $type = '', bool $activeOnly = false)
public function getGenres(string $type = '', bool $activeOnly = false): mixed
{
$sql = $this->getListQuery($type, $activeOnly);
$genres = Cache::get(md5($sql));
if ($genres !== null) {
return $genres;
}
$genres = DB::select($sql);
$expiresAt = now()->addMinutes(config('nntmux.cache_expiry_long'));
Cache::put(md5($sql), $genres, $expiresAt);
return $genres;
return Cache::flexible($sql, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql) {
return DB::select($sql);
});
}
public function loadGenres($type): array
@@ -156,15 +148,8 @@ class Genres
*/
public function getDisabledIDs()
{
$cats = Cache::get('disabledcats');
if ($cats !== null) {
$disabled = $cats;
} else {
$disabled = Genre::query()->where('disabled', '=', 1)->get(['id']);
$expiresAt = now()->addMinutes(config('nntmux.cache_expiry_long'));
Cache::put('disabledcats', $disabled, $expiresAt);
}
return $disabled;
return Cache::flexible('disabledCats', [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () {
return Genre::query()->where('disabled', '=', 1)->get(['id']);
});
}
}
Blacklight/Music.php
+8 -10
View File
@@ -201,17 +201,15 @@ class Music
$order[0],
$order[1]
);
$return = Cache::get(md5($sql.$page));
if ($return !== null) {
return $return;
}
$return = MusicInfo::fromQuery($sql);
if ($return->isNotEmpty()) {
$return[0]->_totalcount = $music['total'][0]->total ?? 0;
}
Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
return Cache::flexible($sql.$page, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql, $music) {
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $music['total'][0]->total ?? 0;
}
return $return;
});
}
public function getMusicOrder($orderBy): array
Blacklight/XXX.php
+8 -10
View File
@@ -166,17 +166,15 @@ class XXX
$order[0],
$order[1]
);
$return = Cache::get(md5($sql.$page));
if ($return !== null) {
return $return;
}
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $xxxmovies['total'][0]->total ?? 0;
}
Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
return Cache::flexible($sql.$page, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql, $xxxmovies) {
$return = DB::select($sql);
if (\count($return) > 0) {
$return[0]->_totalcount = $xxxmovies['total'][0]->total ?? 0;
}
return $return;
});
}
/**