A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: lint coding style (pint)
aminnausine05833afd6a3
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex b9085f0a..bb262cd4 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -18,12 +18,13 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;use Illuminate\Support\Facades\Auth;class MetadataController extends Controller {+ use HasModelHelpers;use HasTags;use HttpResponses;- use HasModelHelpers;public function show($id) {$metadata = Metadata::with(['videoTags.tag'])->findOrFail($id);+return $this->success(new MetadataResource($metadata));}@@ -37,7 +38,7 @@ class MetadataController extends Controller {$compositeId = $video->folder->path . '/' . basename($video->path);$existing = Metadata::where('composite_id', $compositeId)->first();- if ($this->conflictsWithAnother("video_id", $existing, $validated['video_id'])) {+ if ($this->conflictsWithAnother('video_id', $existing, $validated['video_id'])) {return $this->error($existing, 'Metadata with generated unique id already exists for another media!', 500);}@@ -49,6 +50,7 @@ class MetadataController extends Controller {: Metadata::create($validated);$this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);+return $this->success(new VideoResource($metadata->video), $validated);}diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.phpindex 92f31b2b..2bf50a9f 100644--- a/app/Http/Controllers/Api/V1/SeriesController.php+++ b/app/Http/Controllers/Api/V1/SeriesController.php@@ -9,15 +9,15 @@ use App\Http\Resources\SeriesResource;use App\Models\Folder;use App\Models\FolderTag;use App\Models\Series;-use App\Traits\HasTags;use App\Traits\HasModelHelpers;+use App\Traits\HasTags;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;class SeriesController extends Controller {+ use HasModelHelpers;use HasTags;use HttpResponses;- use HasModelHelpers;/* User can:*@@ -51,7 +51,7 @@ class SeriesController extends Controller {$compositeId = $folder->path;$existing = Series::where('composite_id', $compositeId)->first();- if ($this->conflictsWithAnother("folder_id", $existing, $validated['folder_id'])) {+ if ($this->conflictsWithAnother('folder_id', $existing, $validated['folder_id'])) {return $this->error($existing, 'Series already exists for another folder!', 500);}diff --git a/app/Traits/HasModelHelpers.php b/app/Traits/HasModelHelpers.phpindex a3c131b3..161cd7a1 100644--- a/app/Traits/HasModelHelpers.php+++ b/app/Traits/HasModelHelpers.php@@ -9,6 +9,7 @@ trait HasModelHelpers {protected function updateExisting($model, array $validated) {$model->update($validated);+return $model;}}