A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: code smells and old controller structure
aminnausina4172cb679b1
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex bf533782..b9085f0a 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -11,82 +11,59 @@ use App\Http\Resources\VideoResource;use App\Models\Metadata;use App\Models\Video;use App\Models\VideoTag;+use App\Traits\HasModelHelpers;use App\Traits\HasTags;use App\Traits\HttpResponses;+use Illuminate\Database\Eloquent\ModelNotFoundException;use Illuminate\Support\Facades\Auth;class MetadataController extends Controller {use HasTags;use HttpResponses;+ use HasModelHelpers;public function show($id) {- try {- return $this->success(- new MetadataResource(Metadata::with(['videoTags.tag'])->where('id', $id)->first())- );- } catch (\Throwable $th) {- return $this->error(null, 'Unable to get data. Error: ' . $th->getMessage(), 500);- }+ $metadata = Metadata::with(['videoTags.tag'])->findOrFail($id);+ return $this->success(new MetadataResource($metadata));}/*** Store a newly created resource in storage.*/public function store(MetadataStoreRequest $request) {- try {- $validated = $request->validated();+ $validated = $request->validated();- $video = Video::where('id', $request->video_id)->first();- if (! $video) {- return $this->error(null, 'Media does not exist', 404);- }+ $video = Video::findOrFail($validated['video_id']);- $existing = Metadata::where('composite_id', $video->folder->path . '/' . basename($video->path))->first();- if ($existing && $existing->video_id != $request->video_id) {- return $this->error($existing, 'Metadata with generated unique id already exists for another media!', 500);- }-- $validated['editor_id'] = Auth::id();- $validated['composite_id'] = $video->folder->path . '/' . basename($video->path);-- if ($existing) {- $existing->update($validated);-- $this->generateTagRelationships($existing->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);-- return $this->success(new VideoResource($existing->video), $validated); // new MetadataResource($metadata)- }+ $compositeId = $video->folder->path . '/' . basename($video->path);+ $existing = Metadata::where('composite_id', $compositeId)->first();+ if ($this->conflictsWithAnother("video_id", $existing, $validated['video_id'])) {+ return $this->error($existing, 'Metadata with generated unique id already exists for another media!', 500);+ }- $metadata = Metadata::create($validated);+ $validated['editor_id'] = Auth::id();+ $validated['composite_id'] = $compositeId;- $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);+ $metadata = $existing+ ? $this->updateExisting($existing, $validated, $request)+ : Metadata::create($validated);- return $this->success(new VideoResource($metadata->video), $validated); // new MetadataResource($metadata)- } catch (\Throwable $th) {- return $this->error(null, 'Unable to create metadata. Error: ' . $th->getMessage(), 500);- }+ $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);+ return $this->success(new VideoResource($metadata->video), $validated);}/*** Update the specified resource in storage.*/public function update(MetadataUpdateRequest $request, Metadata $metadata) {- try {- $validated = $request->validated();+ $validated = $request->validated();- if (empty($metadata->video)) {- throw new MediaDoesNotExistException('Media does not exist');- }+ $validated['editor_id'] = Auth::id();+ $metadata->update($validated);- $validated['editor_id'] = Auth::id();- $metadata->update($validated);-- $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);+ $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);- return $this->success(new VideoResource($metadata->video), $validated);- } catch (\Throwable $th) {- return $this->error($request, 'Unable to edit video metadata. Error: ' . $th->getMessage(), 500);- }+ return $this->success(new VideoResource($metadata->video), $validated);}public function updateLyrics(LyricsUpdateRequest $request, Metadata $metadata) {@@ -94,7 +71,7 @@ class MetadataController extends Controller {$validated = $request->validated();if (empty($metadata->video)) {- throw new MediaDoesNotExistException('Song does not exist');+ throw new ModelNotFoundException('Song does not exist');}unset($validated['track']);@@ -108,5 +85,3 @@ class MetadataController extends Controller {}}}--class MediaDoesNotExistException extends \Exception {}diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.phpindex 3ca49fc1..92f31b2b 100644--- a/app/Http/Controllers/Api/V1/SeriesController.php+++ b/app/Http/Controllers/Api/V1/SeriesController.php@@ -10,12 +10,14 @@ use App\Models\Folder;use App\Models\FolderTag;use App\Models\Series;use App\Traits\HasTags;+use App\Traits\HasModelHelpers;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;class SeriesController extends Controller {use HasTags;use HttpResponses;+ use HasModelHelpers;/* User can:*@@ -32,69 +34,48 @@ class SeriesController extends Controller {* Display a listing of the resource.*/public function index() {- try {- return $this->success(- SeriesResource::collection(- Series::all()- )- );- } catch (\Throwable $th) {- return $this->error(null, 'Unable to get list of series. Error: ' . $th->getMessage(), 500);- }+ return $this->success(+ SeriesResource::collection(+ Series::all()+ )+ );}/*** Store a newly created resource in storage.*/public function store(SeriesStoreRequest $request) {- try {- $validated = $request->validated();-- $folder = Folder::where('id', $request->folder_id)->first();- if (! $folder) {- return $this->error(null, 'Folder does not exist', 404);- }-- $existing = Series::where('composite_id', $folder->path)->first();- if ($existing && $existing->folder_id != $request->folder_id) {- return $this->error($existing, 'Series already exists for another folder!', 500);- }-- $validated['editor_id'] = Auth::id();- $validated['composite_id'] = $folder->path;+ $validated = $request->validated();- if ($existing) {- $existing->update($validated);+ $folder = Folder::findOrFail($validated['folder_id']);- $this->generateTagRelationships($existing->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);-- return $this->success(new SeriesResource($existing), $validated); // new MetadataResource($metadata)- }+ $compositeId = $folder->path;+ $existing = Series::where('composite_id', $compositeId)->first();+ if ($this->conflictsWithAnother("folder_id", $existing, $validated['folder_id'])) {+ return $this->error($existing, 'Series already exists for another folder!', 500);+ }- $series = Series::create($validated);+ $validated['editor_id'] = Auth::id();+ $validated['composite_id'] = $compositeId;+ $series = $existing+ ? $this->updateExisting($existing, $validated, $request)+ : Series::create($validated);- $this->generateTagRelationships($series->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);+ $this->generateTagRelationships($series->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);- return $this->success(new SeriesResource($series));- } catch (\Throwable $th) {- return $this->error(null, 'Unable to create series. Error: ' . $th->getMessage(), 500);- }+ return $this->success(new SeriesResource($series), $validated);}/*** Update the specified resource in storage.*/public function update(SeriesUpdateRequest $request, Series $series) {- try {- $validated = $request->validated();- $validated['editor_id'] = Auth::id();- $series->update($validated);+ $validated = $request->validated();+ $validated['editor_id'] = Auth::id();+ $series->update($validated);- $this->generateTagRelationships($series->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);+ $this->generateTagRelationships($series->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);- return $this->success(new SeriesResource($series));- } catch (\Throwable $th) {- return $this->error(null, 'Unable to edit series. Error: ' . $th->getMessage(), 500);- }+ return $this->success(new SeriesResource($series));}}diff --git a/app/Http/Requests/MetadataStoreRequest.php b/app/Http/Requests/MetadataStoreRequest.phpindex 4560bd4f..d56d43c3 100644--- a/app/Http/Requests/MetadataStoreRequest.php+++ b/app/Http/Requests/MetadataStoreRequest.php@@ -30,7 +30,7 @@ class MetadataStoreRequest extends FormRequest {*/public function rules(): array {return [- 'video_id' => 'required|integer',+ 'video_id' => 'required|integer|exists:videos,id','title' => 'required|max:255','description' => 'nullable','lyrics' => 'nullable',diff --git a/app/Http/Requests/SeriesStoreRequest.php b/app/Http/Requests/SeriesStoreRequest.phpindex 9dcebc18..b43bd08b 100644--- a/app/Http/Requests/SeriesStoreRequest.php+++ b/app/Http/Requests/SeriesStoreRequest.php@@ -30,7 +30,7 @@ class SeriesStoreRequest extends FormRequest {*/public function rules(): array {return [- 'folder_id' => 'required|integer',+ 'folder_id' => 'required|integer|exists:folders,id','title' => 'required|max:255','description' => 'nullable','studio' => 'nullable|max:255',diff --git a/app/Traits/HasModelHelpers.php b/app/Traits/HasModelHelpers.phpnew file mode 100644index 00000000..a3c131b3--- /dev/null+++ b/app/Traits/HasModelHelpers.php@@ -0,0 +1,14 @@+<?php++namespace App\Traits;++trait HasModelHelpers {+ protected function conflictsWithAnother(string $foreignKey, $existing, $id): bool {+ return $existing && $existing->{$foreignKey} != $id;+ }++ protected function updateExisting($model, array $validated) {+ $model->update($validated);+ return $model;+ }+}diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.tsindex b52b8a08..ecbbdd79 100644--- a/resources/js/service/queries.ts+++ b/resources/js/service/queries.ts@@ -49,7 +49,6 @@ export const useGetSiteAnalytics = (period: Ref<string>) => {const { data: response } = await getSiteAnalytics(period.value);return response;},- // enabled: !!period,});};