A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: add tags to series
aminnausin817f9b235ad8
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex 6a61ef8d..239b7b34 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -10,10 +10,12 @@ use App\Http\Resources\VideoResource;use App\Models\Metadata;use App\Models\Video;use App\Models\VideoTag;+use App\Traits\HasTags;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;class MetadataController extends Controller {+ use HasTags;use HttpResponses;public function show($id) {@@ -35,12 +37,12 @@ class MetadataController extends Controller {$video = Video::where('id', $request->video_id)->first();if (! $video) {- return $this->error(null, 'Video does not exist', 404);+ return $this->error(null, 'Media does not exist', 404);}$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 video!', 500);+ return $this->error($existing, 'Metadata with generated unique id already exists for another media!', 500);}$validated['editor_id'] = Auth::id();@@ -49,14 +51,14 @@ class MetadataController extends Controller {if ($existing) {$existing->update($validated);- $this->generateTags($existing->id, $request->video_tags, $request->deleted_tags);+ $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)}$metadata = Metadata::create($validated);- $this->generateTags($metadata->id, $request->video_tags, $request->deleted_tags);+ $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);return $this->success(new VideoResource($metadata->video), $validated); // new MetadataResource($metadata)} catch (\Throwable $th) {@@ -73,7 +75,7 @@ class MetadataController extends Controller {$validated['editor_id'] = Auth::id();$metadata->update($validated);- $this->generateTags($metadata->id, $request->video_tags, $request->deleted_tags);+ $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) {@@ -81,7 +83,7 @@ class MetadataController extends Controller {}}- public function generateTags($metadata_id, $video_tags, $deleted_tags = []) {+ private function generateTags($metadata_id, $video_tags, $deleted_tags = []) {foreach ($video_tags as $tag) {VideoTag::firstOrCreate(['tag_id' => $tag['id'], 'metadata_id' => $metadata_id]);}diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.phpindex dcab4b92..3ca49fc1 100644--- a/app/Http/Controllers/Api/V1/SeriesController.php+++ b/app/Http/Controllers/Api/V1/SeriesController.php@@ -7,11 +7,14 @@ use App\Http\Requests\SeriesStoreRequest;use App\Http\Requests\SeriesUpdateRequest;use App\Http\Resources\SeriesResource;use App\Models\Folder;+use App\Models\FolderTag;use App\Models\Series;+use App\Traits\HasTags;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;class SeriesController extends Controller {+ use HasTags;use HttpResponses;/* User can:@@ -63,11 +66,15 @@ class SeriesController extends Controller {if ($existing) {$existing->update($validated);+ $this->generateTagRelationships($existing->id, $request->tags, $request->deleted_tags, 'series_id', FolderTag::class);+return $this->success(new SeriesResource($existing), $validated); // new MetadataResource($metadata)}$series = Series::create($validated);+ $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);@@ -83,6 +90,8 @@ class SeriesController extends Controller {$validated['editor_id'] = Auth::id();$series->update($validated);+ $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);diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 2650e536..091c4880 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -3,6 +3,7 @@namespace App\Http\Controllers;use App\Http\Resources\FolderResource;+use App\Http\Resources\SeriesResource;use App\Http\Resources\VideoResource;use App\Models\Category;use App\Models\Folder;@@ -94,15 +95,13 @@ class DirectoryController extends Controller {}private function loadFolderData(array $data, FolderResource $folder): array {- $folder->load(['videos.metadata.videoTags.tag']);+ $folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag']);$data['folder'] = ['id' => $folder->id,'name' => $folder->name,'videos' => VideoResource::collection($folder->videos), // VideoResource::collection(Video::where('folder_id', $folderRaw->id)->get());- 'series' => $data['dir']['folders']- ->firstWhere('id', $folder->id)- ->series,+ 'series' => new SeriesResource($folder->series),];return $data;diff --git a/app/Http/Requests/SeriesStoreRequest.php b/app/Http/Requests/SeriesStoreRequest.phpindex f597ee7f..9dcebc18 100644--- a/app/Http/Requests/SeriesStoreRequest.php+++ b/app/Http/Requests/SeriesStoreRequest.php@@ -41,6 +41,9 @@ class SeriesStoreRequest extends FormRequest {'date_start' => 'nullable|date|date_format:"F d, Y"','date_end' => 'nullable|date|date_format:"F d, Y"','thumbnail_url' => 'nullable|url',+ 'tags' => 'nullable|array',+ 'tags.*.name' => 'required|min:1|max:64',+ 'tags.*.id' => 'required|integer',];}}diff --git a/app/Http/Requests/SeriesUpdateRequest.php b/app/Http/Requests/SeriesUpdateRequest.phpindex 49802754..48c76e1b 100644--- a/app/Http/Requests/SeriesUpdateRequest.php+++ b/app/Http/Requests/SeriesUpdateRequest.php@@ -40,6 +40,11 @@ class SeriesUpdateRequest extends FormRequest {'date_start' => 'nullable|date|date_format:"F d, Y"','date_end' => 'nullable|date|date_format:"F d, Y"','thumbnail_url' => 'nullable|url',+ 'tags' => 'nullable|array',+ 'tags.*.name' => 'required|min:1|max:64',+ 'tags.*.id' => 'required|integer',+ 'deleted_tags' => 'nullable|array',+ 'deleted_tags.*' => 'integer',];}}diff --git a/app/Models/Series.php b/app/Models/Series.phpindex bdf7858b..c3082219 100644--- a/app/Models/Series.php+++ b/app/Models/Series.php@@ -5,6 +5,7 @@ namespace App\Models;use Illuminate\Database\Eloquent\Factories\HasFactory;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Eloquent\Relations\BelongsTo;+use Illuminate\Database\Eloquent\Relations\HasMany;class Series extends Model {use HasFactory;@@ -31,4 +32,8 @@ class Series extends Model {public function editor(): BelongsTo {return $this->belongsTo(User::class);}++ public function folderTags(): HasMany {+ return $this->hasMany(FolderTag::class);+ }}diff --git a/app/Traits/HasTags.php b/app/Traits/HasTags.phpnew file mode 100644index 00000000..71acc450--- /dev/null+++ b/app/Traits/HasTags.php@@ -0,0 +1,40 @@+<?php++namespace App\Traits;++use Illuminate\Support\Facades\Log;++trait HasTags {+ /**+ * Generates tag relationships for any model+ *+ * @param int $relationId Related model Id (metadata_id, series_id)+ * @param array $tags New Tags+ * @param array $deletedTags Deleted Tag Relationship Ids+ * @param string $foreignKey Related Foreign Key+ * @param string $modelClass Related Model Class+ */+ public function generateTagRelationships(+ int $relationId,+ array $tags,+ array $deletedTags,+ string $foreignKey,+ string $modelClass+ ) {+ try {+ foreach ($tags as $tag) {+ $modelClass::firstOrCreate([+ 'tag_id' => $tag['id'],+ $foreignKey => $relationId,+ ]);+ }++ $modelClass::destroy($deletedTags);+ } catch (\Throwable $th) {+ Log::error('Faild creating/deleting tag relationships', [+ 'message' => $th->getMessage(),+ 'trace' => $th->getTrace(),+ ]);+ }+ }+}diff --git a/database/migrations/2025_04_28_050529_enforce_unique_tags.php b/database/migrations/2025_04_28_050529_enforce_unique_tags.phpnew file mode 100644index 00000000..b641d759--- /dev/null+++ b/database/migrations/2025_04_28_050529_enforce_unique_tags.php@@ -0,0 +1,33 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class extends Migration {+ /**+ * Run the migrations.+ */+ public function up(): void {+ Schema::table('folder_tags', function (Blueprint $table) {+ $table->unique(['tag_id', 'series_id']);+ });++ Schema::table('video_tags', function (Blueprint $table) {+ $table->unique(['tag_id', 'metadata_id']);+ });+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void {+ Schema::table('folder_tags', function (Blueprint $table) {+ $table->dropUnique(['tag_id', 'series_id']);+ });++ Schema::table('video_tags', function (Blueprint $table) {+ $table->dropUnique(['tag_id', 'metadata_id']);+ });+ }+};