Skip to content

A self-hosted media server and file management system

fix: preview generator service does not handle poster image urls

aminnausin38dd7815e611
diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.php
index 349f186e..d0c5ae10 100644
--- a/app/Services/PreviewGeneratorService.php
+++ b/app/Services/PreviewGeneratorService.php
@@ -116,9 +116,9 @@ class PreviewGeneratorService {
}
protected function buildVideoPreviewData(Category $category, ?Folder $folder, string $videoId, Request $request, bool $generateRawPreview): array {
- $folderResource = $this->getDecodedResource(new FolderResource($folder));
+ $folderResource = $this->getDecodedResource(new FolderResource($folder->load('series.primaryPoster')));
$video = $folder->videos()->findOrFail($videoId);
- $videoResource = $this->getDecodedResource(new VideoResource($video->load('metadata.videoTags')));
+ $videoResource = $this->getDecodedResource(new VideoResource($video->load('metadata.videoTags', 'metadata.primaryPoster')));
$isAudio = str_starts_with($videoResource->metadata?->mime_type, 'audio');
$thumbnail = $videoResource->metadata->poster_url ?: $folder->series->thumbnail_url ?: $this->defaultThumbnail;
@@ -147,13 +147,13 @@ class PreviewGeneratorService {
}
protected function preparePreviewData(array $baseData, string $pathKey, ?int $dataLastUpdated, bool $generateRawPreview): array {
+ $baseData['raw'] = $baseData['thumbnail_url'];
+
if (! $generateRawPreview && $generatedImage = $this->handleGenerateImage($baseData, $pathKey, $dataLastUpdated)) {
$baseData['thumbnail_url'] = $generatedImage;
$baseData['is_generated'] = true;
}
- $baseData['raw'] = $baseData['thumbnail_url'];
-
return $baseData;
}
@@ -369,6 +369,10 @@ class PreviewGeneratorService {
}
protected function encodeImageURL(string $url): string {
+ if (! filter_var($url, FILTER_VALIDATE_URL) && str_starts_with($url, '/storage')) {
+ $url = config('app.url') . $url;
+ }
+
return str_replace([chr(39), chr(34), ' '], ['%27', '%22', '%20'], $url);
}
}
diff --git a/resources/views/og-preview.blade.php b/resources/views/og-preview.blade.php
index 9427cb7a..a710dea1 100644
--- a/resources/views/og-preview.blade.php
+++ b/resources/views/og-preview.blade.php
@@ -83,7 +83,7 @@ return $json;
@if($updated_at ?? false)
<p>{{$updated_at}}</p>
@endif
- <img src="{{ $raw ?: $thumbnail_url }}" width="1200" class="rounded-xl overflow-clip" alt="open graph preview" />
+ <img src="{{ $thumbnail_url ?: $raw }}" width="1200" class="rounded-xl overflow-clip" alt="open graph preview" />
@if (app()->environment('local'))
<pre class="max-w-full whitespace-pre-wrap bg-neutral-900 text-white p-2 overflow-x-auto text-sm leading-tight">
{!! highlight_json(json_encode(get_defined_vars(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) !!}