Skip to content

A self-hosted media server and file management system

feat: eager load playback

aminnausin23b28286c71c
diff --git a/app/Exceptions/ForbiddenLibraryException.php b/app/Exceptions/ForbiddenLibraryException.php
new file mode 100644
index 00000000..594c855a
--- /dev/null
+++ b/app/Exceptions/ForbiddenLibraryException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ForbiddenLibraryException extends Exception {}
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 05f74582..0a224317 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\Exceptions\ForbiddenLibraryException;
use App\Http\Resources\FolderResource;
use App\Models\Category;
use App\Models\Folder;
@@ -9,7 +10,6 @@ use App\Models\Subtitle;
use App\Services\PathResolverService;
use App\Services\TaskService;
use App\Traits\HttpResponses;
-use Exception;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
@@ -54,7 +54,7 @@ class DirectoryController extends Controller {
'categoryName' => $request->dir ?? '',
'folderName' => $request->folderIdentifier ?? '',
], $e->getMessage(), 404);
- } catch (ForbiddenException $e) {
+ } catch (ForbiddenLibraryException $e) {
$result = $this->error(null, $e->getMessage(), 403);
} catch (\Throwable $th) {
$result = $this->error(null, 'Unable to parse URL: ' . $th->getMessage(), 500);
@@ -85,7 +85,7 @@ class DirectoryController extends Controller {
private function validateCategoryAccess(Category $category): void {
if ($category->is_private && Auth::id() !== 1) {
- throw new ForbiddenException('Access to this folder is forbidden');
+ throw new ForbiddenLibraryException('Access to this folder is forbidden');
}
}
@@ -100,6 +100,7 @@ class DirectoryController extends Controller {
$folder->load([
'series.folderTags.tag',
'videos.metadata.videoTags.tag',
+ 'videos.metadata.playbackProgress' => fn ($q) => $q->where('user_id', Auth::id())->limit(1),
'videos.metadata.subtitles' => function ($q) {
$q->select(Subtitle::getVisibleFields());
},
@@ -111,5 +112,3 @@ class DirectoryController extends Controller {
return $data;
}
}
-
-class ForbiddenException extends Exception {}