Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Fix) Auto fetch igdb metadata on torrent/request create/update #4557

Merged
merged 1 commit into from
Mar 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions app/Http/Controllers/API/TorrentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use App\Models\Tv;
use App\Models\User;
use App\Repositories\ChatRepository;
use App\Services\Igdb\IgdbScraper;
use App\Services\Tmdb\TMDBScraper;
use App\Services\Unit3dAnnounce;
use App\Traits\TorrentMeta;
Expand Down Expand Up @@ -349,17 +350,14 @@ public function store(Request $request): \Illuminate\Http\JsonResponse
Unit3dAnnounce::addFeaturedTorrent($torrent->id);
}

// TMDB updates come after tracker updates in case TMDB's offline
// Metadata updates come after tracker updates in case TMDB or IGDB is offline

$tmdbScraper = new TMDBScraper();

if ($torrent->category->tv_meta && $torrent->tmdb) {
$tmdbScraper->tv($torrent->tmdb);
}

if ($torrent->category->movie_meta && $torrent->tmdb) {
$tmdbScraper->movie($torrent->tmdb);
}
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,
};

// Torrent Keywords System
$keywords = [];
Expand Down
37 changes: 14 additions & 23 deletions app/Http/Controllers/RequestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use App\Models\Tv;
use App\Models\Type;
use App\Repositories\ChatRepository;
use App\Services\Igdb\IgdbScraper;
use App\Services\Tmdb\TMDBScraper;
use Illuminate\Http\Request;
use Exception;
Expand Down Expand Up @@ -155,18 +156,12 @@ public function store(StoreTorrentRequestRequest $request): \Illuminate\Http\Red

$category = $torrentRequest->category;

if ($torrentRequest->tmdb > 0) {
switch (true) {
case $category->tv_meta:
(new TMDBScraper())->tv($torrentRequest->tmdb);

break;
case $category->movie_meta:
(new TMDBScraper())->movie($torrentRequest->tmdb);

break;
}
}
match (true) {
$category->tv_meta && $torrentRequest->tmdb > 0 => new TMDBScraper()->tv($torrentRequest->tmdb),
$category->movie_meta && $torrentRequest->tmdb > 0 => new TMDBScraper()->movie($torrentRequest->tmdb),
$category->game_meta && $torrentRequest->igdb > 0 => new IgdbScraper()->game($torrentRequest->igdb),
default => null,
};

return to_route('requests.index')
->with('success', trans('request.added-request'));
Expand Down Expand Up @@ -211,18 +206,14 @@ public function update(UpdateTorrentRequestRequest $request, TorrentRequest $tor

$torrentRequest->update($request->validated());

if ($torrentRequest->tmdb > 0) {
switch (true) {
case $torrentRequest->category->tv_meta:
(new TMDBScraper())->tv($torrentRequest->tmdb);

break;
case $torrentRequest->category->movie_meta:
(new TMDBScraper())->movie($torrentRequest->tmdb);
$category = $torrentRequest->category;

break;
}
}
match (true) {
$category->tv_meta && $torrentRequest->tmdb > 0 => new TMDBScraper()->tv($torrentRequest->tmdb),
$category->movie_meta && $torrentRequest->tmdb > 0 => new TMDBScraper()->movie($torrentRequest->tmdb),
$category->game_meta && $torrentRequest->igdb > 0 => new IgdbScraper()->game($torrentRequest->igdb),
default => null,
};

return to_route('requests.show', ['torrentRequest' => $torrentRequest])
->with('success', trans('request.edited-request'));
Expand Down
42 changes: 16 additions & 26 deletions app/Http/Controllers/TorrentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
use App\Models\User;
use App\Notifications\TorrentDeleted;
use App\Repositories\ChatRepository;
use App\Services\Igdb\IgdbScraper;
use App\Services\Tmdb\TMDBScraper;
use App\Services\Unit3dAnnounce;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -256,19 +257,14 @@ public function update(UpdateTorrentRequest $request, int $id): \Illuminate\Http

$category = $torrent->category;

// TMDB Meta
if ($torrent->tmdb != 0) {
switch (true) {
case $category->tv_meta:
(new TMDBScraper())->tv($torrent->tmdb);
// Meta

break;
case $category->movie_meta:
(new TMDBScraper())->movie($torrent->tmdb);

break;
}
}
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,
};

return to_route('torrents.show', ['id' => $id])
->with('success', 'Successfully Edited!');
Expand Down Expand Up @@ -448,21 +444,15 @@ public function store(StoreTorrentRequest $request): \Illuminate\Http\RedirectRe

Unit3dAnnounce::addTorrent($torrent);

// TMDB updates come after tracker updates in case TMDB's offline

// TMDB Meta
if ($torrent->tmdb != 0) {
switch (true) {
case $category->tv_meta:
(new TMDBScraper())->tv($torrent->tmdb);
// Metadata updates come after tracker updates in case TMDB or IGDB is offline

break;
case $category->movie_meta:
(new TMDBScraper())->movie($torrent->tmdb);

break;
}
}
// Meta
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,
};

// Torrent Keywords System
$keywords = [];
Expand Down