A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: Folder tag backend structure and improved previews
aminnausin68040c9fc2bf
diff --git a/app/Http/Resources/FolderTagResource.php b/app/Http/Resources/FolderTagResource.phpnew file mode 100644index 00000000..ec6bd61d--- /dev/null+++ b/app/Http/Resources/FolderTagResource.php@@ -0,0 +1,29 @@+<?php++namespace App\Http\Resources;++use Illuminate\Http\Request;+use Illuminate\Http\Resources\Json\JsonResource;++class FolderTagResource extends JsonResource {+ // protected static $tagCache = [];++ /**+ * Transform the resource into an array.+ *+ * @return array<string, mixed>+ */+ public function toArray(Request $request): array {+ if (! $this->relationLoaded('tag')) {+ $this->loadMissing('tag');+ }++ $tag = $this->tag;++ return [+ 'folder_tag_id' => $this->id,+ 'name' => $tag->name,+ 'id' => $this->tag_id,+ ];+ }+}diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.phpindex 8386a86f..e263d464 100644--- a/app/Http/Resources/SeriesResource.php+++ b/app/Http/Resources/SeriesResource.php@@ -27,7 +27,6 @@ class SeriesResource extends JsonResource {return ['id' => $this->id,'folder_id' => $this->folder_id,- // 'editor' => $editor,'editor_id' => $this->editor_id,'title' => $this->title ?? $this->folder->name,'description' => $this->description,@@ -36,10 +35,12 @@ class SeriesResource extends JsonResource {'seasons' => $this->seasons,'episodes' => $this->episodes,'films' => $this->films,+ 'folder_tags' => FolderTagResource::collection($this->folderTags ?? []),'date_start' => $this->date_start,'date_end' => $this->date_end,'thumbnail_url' => $this->thumbnail_url,'date_updated' => $this->updated_at,+ 'date_created' => $this->created_at,];}}diff --git a/app/Models/Folder.php b/app/Models/Folder.phpindex 44e68fca..c1423393 100755--- a/app/Models/Folder.php+++ b/app/Models/Folder.php@@ -25,6 +25,10 @@ class Folder extends Model {return $this->belongsTo(Category::class);}+ public function folderTags(): HasMany {+ return $this->hasMany(FolderTag::class);+ }+public function getTotalSizeAttribute() {return $this->videos()->join('metadata', 'videos.id', '=', 'metadata.video_id')->sum('metadata.file_size');}diff --git a/app/Models/FolderTag.php b/app/Models/FolderTag.phpnew file mode 100644index 00000000..fd001ab0--- /dev/null+++ b/app/Models/FolderTag.php@@ -0,0 +1,20 @@+<?php++namespace App\Models;++use Illuminate\Database\Eloquent\Model;++class FolderTag extends Model {+ protected $fillable = [+ 'series_id',+ 'tag_id',+ ];++ public function series() {+ return $this->belongsTo(Series::class);+ }++ public function tag() {+ return $this->belongsTo(Tag::class);+ }+}diff --git a/app/Models/Tag.php b/app/Models/Tag.phpindex bd2d5d2c..2348c5c4 100644--- a/app/Models/Tag.php+++ b/app/Models/Tag.php@@ -17,7 +17,11 @@ class Tag extends Model {return $this->belongsTo(User::class);}- public function metadata() {- return $this->belongsTo(Metadata::class);+ public function videoTag() {+ return $this->hasMany(VideoTag::class);+ }++ public function folderTag() {+ return $this->hasMany(FolderTag::class);}}diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.phpindex 24847a23..2316c5ab 100644--- a/app/Services/PreviewGeneratorService.php+++ b/app/Services/PreviewGeneratorService.php@@ -50,7 +50,7 @@ class PreviewGeneratorService {}}- public function handleGenerateImage(array $data, string $relativePath, ?string $dataLastUpdated = null, bool $queued = false): ?string {+ public function handleGenerateImage(array $data, string $relativePath, ?int $dataLastUpdated = 0, bool $queued = false): ?string {try {$override = Config('services.preview_generator.override');$relativePath = trim('previews/' . $relativePath, '/') . '.png';@@ -58,7 +58,7 @@ class PreviewGeneratorService {if (! Storage::disk('public')->exists($relativePath)) {$queued = false;- } elseif (! $override && Storage::disk('public')->exists($relativePath) && ! is_null($dataLastUpdated) && filemtime($fullPath) > strtotime($dataLastUpdated)) {+ } elseif (! $override && Storage::disk('public')->exists($relativePath) && ! is_null($dataLastUpdated) && filemtime($fullPath) > $dataLastUpdated) {return VerifyFiles::getPathUrl($relativePath);}@@ -91,42 +91,40 @@ class PreviewGeneratorService {$isAudio = $folder->isMajorityAudio();$fileCount = $folderResource->file_count ?? 0;- $fileType = ($isAudio ? 'track' : 'episode') . ($fileCount === 1 ? '' : 's');- $releaseDate = $this->getMediaReleaseSeason($folderResource->series->date_start ?: '');- $contentString = ($releaseDate ? "$releaseDate • " : '') . "$fileCount $fileType";+ $fileType = ($isAudio ? 'Track' : 'Episode') . ($fileCount === 1 ? '' : 's');+ $contentString = ($folderResource->series->date_start ? $this->getMediaReleaseSeason($folderResource->series->date_start) . ' • ' : '') . "$fileCount $fileType";+ $studio = ucfirst($folderResource?->series?->studio);$data = [- 'title' => ucfirst($category->name) . " · {$folderResource->series->title}",+ 'title' => "{$folderResource->series->title}",'description' => $folderResource->series->description ?: 'No description is available.',- 'studio' => ucfirst($folderResource->series->studio),+ 'studio' => ($studio ? $studio . ' · ' : '') . ucfirst($category->name),'is_audio' => $isAudio,'file_count' => $folderResource->file_count,'thumbnail_url' => $thumbnail,- 'release_date' => $releaseDate,+ 'upload_date' => $this->formatDate($folderResource->series->date_created),'content_string' => $contentString,+ 'tags' => $folderResource->series->folder_tags ? array_map(fn ($tag) => $tag->name, $folderResource->series->folder_tags) : null,'url' => $request->fullUrl(),];- if ($generatedImage = $this->handleGenerateImage($data, "folders/{$folder->id}", $folderResource->series?->date_updated)) {- $data['thumbnail_url'] = $generatedImage;- $data['is_generated'] = true;- }-- $data['raw'] = $data['thumbnail_url'];-- return $data;+ return $this->preparePreviewData($data, "folders/{$folder->id}", strtotime($folderResource->series?->date_updated ?? ''));}protected function buildVideoPreviewData(Category $category, ?Folder $folder, string $videoId, Request $request): array {$folderResource = $this->getDecodedResource(new FolderResource($folder));$video = $folder->videos()->findOrFail($videoId);$videoResource = $this->getDecodedResource(new VideoResource($video));+$isAudio = str_starts_with($videoResource->metadata?->mime_type, 'audio');$thumbnail = $videoResource->metadata->poster_url ?: $folder->series->thumbnail_url ?: asset('storage/thumbnails/default.webp');$releaseDate = $this->formatDate($video->metadata->date_released ?: $video->metadata->date_uploaded);$contentString = $releaseDate . ' • ' . $this->formatDuration($videoResource?->metadata?->duration ?? null);+ $folderDateUpdated = strtotime($folderResource->series->date_updated);+ $videoDateUpdated = strtotime($videoResource->date_updated ?? '') ?: 0;+ $latestTimestamp = max($folderDateUpdated, $videoDateUpdated);$data = ['title' => ucfirst($folderResource->series->title) . " · {$video->metadata->title}",'description' => $video->metadata->description ?: $folderResource->series->description ?: 'No description is available.',@@ -134,20 +132,25 @@ class PreviewGeneratorService {'is_audio' => $isAudio,'content_string' => $contentString,'release_date' => $releaseDate,+ 'upload_date' => $this->formatDate($video->metadata->date_uploaded),'mime_type' => $video->mime_type,'tags' => $videoResource->video_tags ? array_map(fn ($tag) => $tag->name, $videoResource->video_tags) : null,- 'studio' => ucfirst($folderResource->series->studio),+ 'studio' => ucfirst($folderResource?->series?->studio),'url' => $request->fullUrl(),];- if ($generatedImage = $this->handleGenerateImage($data, "{$folder->path}/{$video->id}", $videoResource?->date_updated)) {- $data['thumbnail_url'] = $generatedImage;- $data['is_generated'] = true;+ return $this->preparePreviewData($data, "{$folder->path}/{$video->id}", $latestTimestamp);+ }++ protected function preparePreviewData(array $baseData, string $pathKey, ?int $dataLastUpdated): array {+ if ($generatedImage = $this->handleGenerateImage($baseData, $pathKey, $dataLastUpdated)) {+ $baseData['thumbnail_url'] = $generatedImage;+ $baseData['is_generated'] = true;}- $data['raw'] = $data['thumbnail_url'];+ $baseData['raw'] = $baseData['thumbnail_url'];- return $data;+ return $baseData;}public function generateImage(array $data, string $relativePath) {@@ -242,9 +245,9 @@ class PreviewGeneratorService {}}- protected function formatDate(?string $date) {+ protected function formatDate(?string $date, ?string $errorMessage = 'Unknown Date') {if (! $date) {- return 'Unknown Date';+ return $errorMessage;}return Carbon::createFromDate($date)->format('F Y');diff --git a/database/migrations/2025_04_21_003922_add_preview_u_r_ls_to_series_and_metadata.php b/database/migrations/2025_04_21_003922_add_preview_links_to_series_and_metadata.phpsimilarity index 75%rename from database/migrations/2025_04_21_003922_add_preview_u_r_ls_to_series_and_metadata.phprename to database/migrations/2025_04_21_003922_add_preview_links_to_series_and_metadata.phpindex 265ea28f..75ceedaa 100644--- a/database/migrations/2025_04_21_003922_add_preview_u_r_ls_to_series_and_metadata.php+++ b/database/migrations/2025_04_21_003922_add_preview_links_to_series_and_metadata.php@@ -11,8 +11,10 @@ return new class extends Migration {public function up(): void {Schema::table('series', function (Blueprint $table) {//+ $table->string('raw_thumbnail_url')->nullable();});Schema::table('metadata', function (Blueprint $table) {+ $table->string('raw_thumbnail_url')->nullable();//});}@@ -22,9 +24,11 @@ return new class extends Migration {*/public function down(): void {Schema::table('series', function (Blueprint $table) {+ $table->dropColumn('raw_thumbnail_url');//});Schema::table('metadata', function (Blueprint $table) {+ $table->dropColumn('raw_thumbnail_url');//});}diff --git a/database/migrations/2025_04_27_200432_create_folder_tags_table.php b/database/migrations/2025_04_27_200432_create_folder_tags_table.phpnew file mode 100644index 00000000..5b893827--- /dev/null+++ b/database/migrations/2025_04_27_200432_create_folder_tags_table.php@@ -0,0 +1,30 @@+<?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::create('folder_tags', function (Blueprint $table) {+ $table->id();+ $table->unsignedBigInteger('tag_id');+ $table->foreignId('series_id')->constrained()->cascadeOnDelete();+ $table->foreign('tag_id')+ ->references('id')+ ->on('tags')+ ->cascadeOnDelete();+ $table->timestamps();+ });+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void {+ Schema::dropIfExists('folder_tags');+ }+};diff --git a/resources/views/og-media-preview.blade.php b/resources/views/og-media-preview.blade.phpindex 72065b62..d49388b2 100644--- a/resources/views/og-media-preview.blade.php+++ b/resources/views/og-media-preview.blade.php@@ -16,39 +16,40 @@ $banner_url = str_replace('http://', 'https://', $banner_url ?? $thumbnail_url);</style></head>-<body class="flex items-center justify-center text-xl ">- <div class="relative flex w-[1200px] h-[630px] overflow-hidden">- <div class="relative flex-1"></div>-- <img src="{{ $thumbnail_url }}" alt="Cover" class="relative overflow-hidden z-10 object-cover min-w-[40%]" />-- <div class="z-20 absolute h-full -skew-x-3 -left-8 bg-cover bg-center overflow-clip w-[65%]" style="background-image: url('{{ $banner_url ?? $thumbnail_url }}'); backface-visibility: hidden; transform-style: preserve-3d; background-size: 150%;">- <div class="absolute inset-0 bg-slate-900/50 backdrop-blur-md "></div>- <div class=" z-30 h-full p-8 px-16 text-white flex flex-col justify-center skew-x-3 ">- <section class="flex flex-col">- <p class="drop-shadow-lg">{{$content_string}}</p>- <h2 class="text-4xl font-bold mt-2 drop-shadow-lg">{{ $title }}</h2>- <p class="text-yellow-400 mt-2 text-2xl drop-shadow-lg">{{ $studio ?? ""}}</p>- </section>- <section class="flex flex-col justify-end mt-auto gap-3">- <span class="flex items-center gap-6">- <div class="flex items-center text-4xl font-semibold">- ⭐ <span class="ml-1">{{$rating ?? 87}}%</span>- </div>- <p class="line-clamp-2 drop-shadow-lg whitespace-pre-wrap flex-1">{{ $description ?? ""}}</p>- </span>-- <div class="mt-auto flex items-center gap-3">- @foreach (collect($tags ?? ['Drama','Thriller','Action'])->take(5) as $tag)- <span class="bg-white/10 px-3 py-1 rounded-full ">{{ $tag }}</span>- @endforeach-- </div>- </section>+<body class="flex items-center justify-center text-xl text-white">+ <section class="relative flex w-[1200px] h-[630px] overflow-hidden bg-cover bg-left" style="background-image: url('{{ $banner_url ?? $thumbnail_url }}'); backface-visibility: hidden; transform-style: preserve-3d; background-size: 80%;">+ <!-- Banner + Overlay Z-10 (Covers Thumbnail) -->+ <div class="z-10 absolute h-full -skew-x-3 -left-8 overflow-clip w-[65%] bg-cover bg-center" style="background-image: url('{{ $banner_url ?? $thumbnail_url }}'); backface-visibility: hidden; transform-style: preserve-3d; background-size: 150%;">+ <div class="w-screen h-screen bg-slate-900/50 backdrop-blur-md"></div>+ </div>+ <!-- Text (LEFT) Z-20 (Covers Everything) -->+ <div class="z-20 flex flex-col flex-1 justify-center p-8">+ <div class="flex flex-col">+ <p class="drop-shadow-lg">{{$content_string}}</p>+ <h2 class="text-4xl font-bold mt-2 drop-shadow-lg">{{ $title }}</h2>+ <p class="text-yellow-400 mt-2 text-2xl drop-shadow-lg">{{ $studio ?? ""}}</p>+ </div>+ <div class="flex flex-col justify-end mt-auto gap-3">+ <span class="flex items-center gap-6">+ <!-- <div class="flex items-center text-4xl font-semibold">+ ⭐ <span class="ml-1">{{$rating ?? 0}}%</span>+ </div> -->+ <p class="line-clamp-2 drop-shadow-lg whitespace-pre-wrap flex-1">{{ $description ?? ""}}</p>+ </span>++ <div class="flex items-center gap-3">+ @foreach (collect($tags ?? ['no tags yet'])->take(5) as $tag)+ <span class="bg-white/10 px-3 py-1 rounded-full ">{{ $tag }}</span>+ @endforeach+ @if ($upload_date ?? false)+ <span class="ml-auto py-1 pe-3">{{ $upload_date}}</span>+ @endif+ </div></div></div>-- </div>+ <!-- Thumbnail (RIGHT) -->+ <img src="{{ $thumbnail_url }}" alt="Cover" class="relative overflow-hidden object-cover min-w-[40%]" />+ </section></body></html>\ No newline at end of file