mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-21 09:20:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: split tmdb into movie_id and tv_id

Browse Source 
Step 2 in cleaner meta fetching code.
This commit is contained in:
Roardom
2025-03-13 21:27:46 +00:00
parent 09f8404ada
commit 32cf8da4db
61 changed files with 1062 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/API/QuickSearchController.php
+4 -1
View File
@@ -46,7 +46,10 @@ class QuickSearchController extends Controller
$searchById = false;
if (preg_match('/^(\d+)$/', $query, $matches)) {
$filters[] = 'tmdb = '.$matches[1];
$filters[] = [
'movie_id = '.$matches[1],
'tv_id = '.$matches[1],
];
$searchById = true;
}
app/Http/Controllers/API/TorrentController.php
+62 -21
View File
@@ -161,7 +161,8 @@ class TorrentController extends BaseController
$torrent->user_id = $user->id;
$torrent->imdb = $request->input('imdb');
$torrent->tvdb = $request->input('tvdb');
$torrent->tmdb = $request->input('tmdb');
$torrent->movie_id = $category->movie_meta ? $request->integer('tmdb') : 0;
$torrent->tv_id = $category->tv_meta ? $request->integer('tmdb') : 0;
$torrent->mal = $request->input('mal');
$torrent->igdb = $request->integer('igdb');
$torrent->season_number = $request->input('season_number');
@@ -248,24 +249,64 @@ class TorrentController extends BaseController
'exists:users,id',
],
'imdb' => [
'required',
'numeric',
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
]),
],
'tvdb' => [
'required',
'numeric',
Rule::when($category->tv_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!$category->tv_meta, [
Rule::in([0]),
]),
],
'tmdb' => [
'required',
'numeric',
'movie_id' => [
Rule::when($category->movie_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!$category->movie_meta, [
Rule::in([0]),
]),
],
'tv_id' => [
Rule::when($category->tv_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!$category->tv_meta, [
Rule::in([0]),
]),
],
'mal' => [
'required',
'numeric',
Rule::when($category->movie_meta || $category->tv_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!($category->movie_meta || $category->tv_meta), [
Rule::in([0]),
]),
],
'igdb' => [
'required',
'numeric',
Rule::when($category->game_meta, [
'required',
'decimal:0',
'min:0',
]),
Rule::when(!$category->game_meta, [
Rule::in([0]),
]),
],
'season_number' => [
Rule::when($category->tv_meta, [
@@ -353,10 +394,10 @@ class TorrentController extends BaseController
// Metadata updates come after tracker updates in case TMDB or IGDB is offline
match (true) {
$category->tv_meta && $torrent->tmdb > 0 => new TMDBScraper()->tv($torrent->tmdb),
$category->movie_meta && $torrent->tmdb > 0 => new TMDBScraper()->movie($torrent->tmdb),
$category->game_meta && $torrent->igdb > 0 => new IgdbScraper()->game($torrent->igdb),
default => null,
$category->tv_meta && $torrent->tv_id > 0 => new TMDBScraper()->tv($torrent->tv_id),
$category->movie_meta && $torrent->movie_id > 0 => new TMDBScraper()->movie($torrent->movie_id),
$category->game_meta && $torrent->igdb > 0 => new IgdbScraper()->game($torrent->igdb),
default => null,
};
// Torrent Keywords System
@@ -463,12 +504,12 @@ class TorrentController extends BaseController
$torrent->setAttribute('meta', null);
if ($torrent->category->tv_meta && $torrent->tmdb) {
$torrent->setAttribute('meta', Tv::with(['genres'])->find($torrent->tmdb));
if ($torrent->category->tv_meta && $torrent->tv_id) {
$torrent->setAttribute('meta', Tv::with(['genres'])->find($torrent->tv_id));
}
if ($torrent->category->movie_meta && $torrent->tmdb) {
$torrent->setAttribute('meta', Movie::with(['genres'])->find($torrent->tmdb));
if ($torrent->category->movie_meta && $torrent->movie_id) {
$torrent->setAttribute('meta', Movie::with(['genres'])->find($torrent->movie_id));
}
if ($torrent->category->game_meta && $torrent->igdb) {
@@ -637,7 +678,7 @@ class TorrentController extends BaseController
'seeders' => $hit['seeders'],
'leechers' => $hit['leechers'],
'times_completed' => $hit['times_completed'],
'tmdb_id' => $hit['tmdb'],
'tmdb_id' => $hit['movie_id'] ?: $hit['tv_id'] ?: 0,
'imdb_id' => $hit['imdb'],
'tvdb_id' => $hit['tvdb'],
'mal_id' => $hit['mal'],