Skip to content

A self-hosted media server and file management system

fix: update og image generation, always generate on dev server and display folders with audio wording when audio files are the majority

aminnausin0647f111d48d
diff --git a/app/Models/Folder.php b/app/Models/Folder.php
index 7b988cff..44e68fca 100755
--- a/app/Models/Folder.php
+++ b/app/Models/Folder.php
@@ -29,6 +29,22 @@ class Folder extends Model {
return $this->videos()->join('metadata', 'videos.id', '=', 'metadata.video_id')->sum('metadata.file_size');
}
+ public function isMajorityAudio(): bool {
+ $totalVideos = $this->videos()->count();
+
+ if ($totalVideos === 0) {
+ return false;
+ }
+
+ $audioVideos = $this->videos()
+ ->whereHas('metadata', function ($query) {
+ $query->where('mime_type', 'like', 'audio%');
+ })
+ ->count();
+
+ return $audioVideos >= ($totalVideos / 2);
+ }
+
// protected static function boot() {
// parent::boot(); // Automatic withCount
// static::addGlobalScope('videosCount', function ($builder) {
diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.php
index cf4ee577..24847a23 100644
--- a/app/Services/PreviewGeneratorService.php
+++ b/app/Services/PreviewGeneratorService.php
@@ -52,25 +52,27 @@ class PreviewGeneratorService {
public function handleGenerateImage(array $data, string $relativePath, ?string $dataLastUpdated = null, bool $queued = false): ?string {
try {
+ $override = Config('services.preview_generator.override');
$relativePath = trim('previews/' . $relativePath, '/') . '.png';
$fullPath = Storage::disk('public')->path($relativePath);
if (! Storage::disk('public')->exists($relativePath)) {
$queued = false;
- } elseif (Storage::disk('public')->exists($relativePath) && ! is_null($dataLastUpdated) && filemtime($fullPath) > strtotime($dataLastUpdated)) {
+ } elseif (! $override && Storage::disk('public')->exists($relativePath) && ! is_null($dataLastUpdated) && filemtime($fullPath) > strtotime($dataLastUpdated)) {
return VerifyFiles::getPathUrl($relativePath);
}
- if ($queued) {
+ if (! $override && $queued) {
GeneratePreviewImage::dispatch($data, $relativePath);
- return asset('storage/thumbnails/default.webp');
+ return VerifyFiles::getPathUrl($relativePath);
}
$generatedImage = $this->generateImage($data, $relativePath);
if (! $generatedImage) {
throw new Exception('Failed to generate Image');
}
+
Storage::disk('public')->put($relativePath, $generatedImage);
return VerifyFiles::getPathUrl($relativePath);
@@ -87,8 +89,9 @@ class PreviewGeneratorService {
$folderResource = $this->getDecodedResource(new FolderResource($folder));
$thumbnail = $folder->series->thumbnail_url ?: asset('storage/thumbnails/default.webp');
+ $isAudio = $folder->isMajorityAudio();
$fileCount = $folderResource->file_count ?? 0;
- $fileType = 'episode' . ($fileCount === 1 ? '' : 's');
+ $fileType = ($isAudio ? 'track' : 'episode') . ($fileCount === 1 ? '' : 's');
$releaseDate = $this->getMediaReleaseSeason($folderResource->series->date_start ?: '');
$contentString = ($releaseDate ? "$releaseDate • " : '') . "$fileCount $fileType";
@@ -96,6 +99,7 @@ class PreviewGeneratorService {
'title' => ucfirst($category->name) . " · {$folderResource->series->title}",
'description' => $folderResource->series->description ?: 'No description is available.',
'studio' => ucfirst($folderResource->series->studio),
+ 'is_audio' => $isAudio,
'file_count' => $folderResource->file_count,
'thumbnail_url' => $thumbnail,
'release_date' => $releaseDate,
@@ -103,7 +107,11 @@ class PreviewGeneratorService {
'url' => $request->fullUrl(),
];
- $data['thumbnail_url'] = $this->handleGenerateImage($data, "folders/{$folder->id}", $folderResource->series?->date_updated) ?? $thumbnail;
+ 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;
@@ -132,7 +140,11 @@ class PreviewGeneratorService {
'url' => $request->fullUrl(),
];
- $data['thumbnail_url'] = $this->handleGenerateImage($data, "{$folder->path}/{$video->id}", $videoResource?->date_updated) ?? $thumbnail;
+ if ($generatedImage = $this->handleGenerateImage($data, "{$folder->path}/{$video->id}", $videoResource?->date_updated)) {
+ $data['thumbnail_url'] = $generatedImage;
+ $data['is_generated'] = true;
+ }
+
$data['raw'] = $data['thumbnail_url'];
return $data;
diff --git a/config/services.php b/config/services.php
index 58874e71..89d04193 100755
--- a/config/services.php
+++ b/config/services.php
@@ -40,5 +40,8 @@ return [
'site_id' => env('PLAUSIBLE_SITE_ID'),
'token' => env('PLAUSIBLE_API_TOKEN'),
],
+ 'preview_generator' => [
+ 'override' => env('APP_ENV') === 'local',
+ ],
];
diff --git a/resources/views/og-media-preview.blade.php b/resources/views/og-media-preview.blade.php
index eb0f490d..72065b62 100644
--- a/resources/views/og-media-preview.blade.php
+++ b/resources/views/og-media-preview.blade.php
@@ -27,7 +27,7 @@ $banner_url = str_replace('http://', 'https://', $banner_url ?? $thumbnail_url);
<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-6xl font-bold mt-2 drop-shadow-lg">{{ $title }}</h2>
+ <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">
@@ -35,11 +35,11 @@ $banner_url = str_replace('http://', 'https://', $banner_url ?? $thumbnail_url);
<div class="flex items-center text-4xl font-semibold">
⭐ <span class="ml-1">{{$rating ?? 87}}%</span>
</div>
- <p class="line-clamp-1 drop-shadow-lg whitespace-pre-wrap flex-1">{{ $description ?? ""}}</p>
+ <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 ?? [])->take(3) as $tag)
+ @foreach (collect($tags ?? ['Drama','Thriller','Action'])->take(5) as $tag)
<span class="bg-white/10 px-3 py-1 rounded-full ">{{ $tag }}</span>
@endforeach
diff --git a/resources/views/og-preview.blade.php b/resources/views/og-preview.blade.php
index fdc463ba..e178673a 100644
--- a/resources/views/og-preview.blade.php
+++ b/resources/views/og-preview.blade.php
@@ -24,12 +24,14 @@ $raw = str_replace('http://', 'https://', $raw ?? '');
<meta property="og:title" content="{{ $title }}">
<meta property="og:description" content="{{ $description }}">
<meta property="og:image" content="{{ $thumbnail_url ?? asset('storage/thumbnails/default.webp') }}">
- <meta property="og:image:width" content="1200">
- <meta property="og:image:height" content="630">
<meta property="og:url" content="{{ $url }}">
<meta property="og:site_name" content="Media Server">
+ @if ($is_generated ?? false)
+ <meta property="og:image:width" content="1200">
+ <meta property="og:image:height" content="630">
<meta name="twitter:card" content="summary_large_image">
+ @endif
<!-- <meta property="og:image" content="https://img.anili.st/media/176301" data-vue-meta="true"> -->
@vite('resources/css/app.css')