A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: increase path resolver support
aminnausin46c0867cbdea
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 7256561b..9593c37f 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -42,7 +42,7 @@ class DirectoryController extends Controller {$folderList = $this->loadCategoryFolders($category->id);$data['dir']['folders'] = FolderResource::collection($folderList); // Full category data as http resources- $folder = $resolver->resolveFolder($folderIdentifier, $folderList, $category); // Load folder+ $folder = $resolver->resolveFolder($folderIdentifier, $category, $folderList); // Load folder$data = $this->loadFolderData($data, new FolderResource($folder));return $this->success($data, '', 200);@@ -107,83 +107,7 @@ class DirectoryController extends Controller {return $data;}-- // private function parseCategory(string $dirName, ?array $selectQuery = ['id', 'name', 'default_folder_id', 'is_private']): Category {- // //TODO: Use Path Resolver to support name or id-- // $query = Category::select(...$selectQuery);-- // $category = Category::select(...$selectQuery)- // ->firstWhere('name', 'like', '%' . $dirName . '%');-- // if ($category) {- // return $category;- // }-- // if (!ctype_digit($dirName) || (int)$dirName <= 0) {- // throw new ModelNotFoundException("No category found with name matching '{$dirName}'");- // }-- // try {- // return $query->findOrFail((int)$dirName);- // } catch (ModelNotFoundException $e) {- // throw new ModelNotFoundException(- // "No category found with name or ID matching '{$dirName}'",- // 0,- // $e- // );- // }- // }-- // private function parseFolder(array $data, Category $category): FolderResource {- // $folderIdentifier = trim($data['folder']['name'] ?? '');- // $folder = empty($folderIdentifier) ? $this->getDefaultFolder($data['dir']['folders'], $category) : $this->getFolderByName($data['dir']['folders'], $folderIdentifier);-- // if (!empty($folderIdentifier)) {- // $folder = $this->getFolderByName($data['dir']['folders'], $folderIdentifier);- // if ($folder) {- // return $folder;- // }- // } else {- // return $this->getDefaultFolder($data['dir']['folders'], $category);- // }-- // if ($folder) {- // return $folder;- // }-- // if (!ctype_digit($folderIdentifier) || (int)$folderIdentifier <= 0) {- // throw new ModelNotFoundException("No folder found in category '{$category->name}' with name matching '{$folderIdentifier}'");- // }-- // try {- // return Folder::where('category_id', $category->id)- // ->findOrFail($folderIdentifier);- // } catch (ModelNotFoundException $e) {- // throw new ModelNotFoundException(- // "No folder found in category '{$category->name}' with name or ID matching '{$folderIdentifier}'",- // 0,- // $e- // );- // }- // }-- // private function getDefaultFolder(ResourceCollection $folders, Category $category): FolderResource {- // return $category->default_folder_id- // ? $folders->firstWhere('id', $category->default_folder_id)- // : $folders->first();- // }-- // private function getFolderByName(ResourceCollection $folders, string $folderName): ?FolderResource {- // //TODO: Use Path Resolver to support name or id- // $folderName = strtolower($folderName);-- // return $folders->first(function ($folder) use ($folderName) {- // return strtolower($folder->name) === $folderName;- // }) ?? $folders->first(function ($folder) use ($folderName) {- // return str_contains(strtolower($folder->name), $folderName);- // });- // }}-class ForbiddenException extends Exception {}+class ForbiddenException extends Exception {+}diff --git a/app/Services/PathResolverService.php b/app/Services/PathResolverService.phpindex d09f170c..91cceca1 100644--- a/app/Services/PathResolverService.php+++ b/app/Services/PathResolverService.php@@ -4,21 +4,34 @@ namespace App\Services;use App\Models\Category;use App\Models\Folder;+use Illuminate\Database\Eloquent\Builder;use Illuminate\Database\Eloquent\Collection;use Illuminate\Database\Eloquent\ModelNotFoundException;-// TODO: Finish this. Unused for now.-class PathResolverService {+ private bool $onlyPublic = false;++ public function onlyPublic(bool $value = true): self {+ $this->onlyPublic = $value;+ return $this;+ }++ private function addPrivacyFilter(Builder $query): Builder {+ return $this->onlyPublic+ ? $query->where('is_private', false)+ : $query;+ }+public function resolveCategory(string $identifier, array $select = ['id', 'name', 'default_folder_id', 'is_private']): Category {return $this->firstSuccessful([- fn () => $this->resolveCategoryByName($identifier, $select),- fn () => $this->resolveCategoryById($identifier, $select),+ fn() => $this->resolveCategoryByName($identifier, $select),+ fn() => $this->resolveCategoryById($identifier, $select),], "No category found matching '{$identifier}'");}private function resolveCategoryByName(string $identifier, array $select): ?Category {- return Category::select(...$select)+ return $this->addPrivacyFilter(Category::query())+ ->select(...$select)->whereRaw('LOWER(name) = ?', [strtolower($identifier)])->first();}@@ -28,33 +41,36 @@ class PathResolverService {return null;}- return Category::select(...$select)->find((int) $identifier);+ return $this->addPrivacyFilter(Category::query())+ ->select(...$select)->find((int) $identifier);}- public function resolveFolder(string $identifier, Collection $folders, Category $category): Folder {+ public function resolveFolder(string $identifier, Category $category, ?Collection $folders = null): ?Folder {+ if (!$folders) $folders = Folder::where('category_id', $category->id)->get();+return $this->firstSuccessful([- fn () => $this->resolveFolderByName($identifier, $folders, $category),- fn () => $this->resolveFolderById($identifier, $folders, $category),+ fn() => $this->resolveFolderByName($identifier, $category, $folders),+ fn() => $this->resolveFolderById($identifier, $category, $folders),], "No folder found in category '{$category->name}' matching '{$identifier}'");}- private function resolveFolderById(string $identifier, Collection $folders, Category $category): ?Folder {+ private function resolveFolderById(string $identifier, Category $category, Collection $folders): ?Folder {if (! ctype_digit($identifier) || (int) $identifier <= 0) {- return null;+ throw new ModelNotFoundException("No folder found in category '{$category->name}' matching '{$identifier}'");}return $folders->where('category_id', $category->id)->find((int) $identifier);}- private function resolveDefaultFolder(Collection $folders, Category $category): Folder {+ private function resolveDefaultFolder(Category $category, Collection $folders): Folder {return $category->default_folder_id? $folders->firstWhere('id', $category->default_folder_id): $folders->first();}- private function resolveFolderByName(string $identifier, Collection $folders, Category $category): ?Folder {+ private function resolveFolderByName(string $identifier, Category $category, Collection $folders): ?Folder {if (! $identifier) {- return $this->resolveDefaultFolder($folders, $category);+ return $this->resolveDefaultFolder($category, $folders);}$identifier = strtolower($identifier);