Skip to content

A self-hosted media server and file management system

fix: loading folder should not be required to get absolute path of a media file

aminnausina22e868343c0
diff --git a/app/Jobs/Utility/Subtitles/ScanSubtitles.php b/app/Jobs/Utility/Subtitles/ScanSubtitles.php
index 9554fcf7..6795e7ab 100644
--- a/app/Jobs/Utility/Subtitles/ScanSubtitles.php
+++ b/app/Jobs/Utility/Subtitles/ScanSubtitles.php
@@ -73,7 +73,7 @@ class ScanSubtitles extends ManagedSubTask {
$batchTransactions = [];
$scannedUuids = [];
- $metadataMap = Metadata::with('video.folder')
+ $metadataMap = Metadata::with('video')
->whereIn('uuid', array_map(fn ($t) => $t->uuid, $this->targets))
->get()
->keyBy('uuid');
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index f0c3a3c9..ba04348b 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -580,7 +580,11 @@ class VerifyFiles extends ManagedSubTask {
}
public static function getAbsoluteMediaPath($media) {
- return str_replace('\\', '/', Storage::disk('public')->path('')) . "media/{$media->folder->path}/" . basename($media->path);
+ $path = str_starts_with($media->path, 'storage/')
+ ? substr($media->path, 8)
+ : $media->path;
+
+ return str_replace('\\', '/', Storage::disk('public')->path($path));
}
protected function resolveMediaUuid($media, $filePath) {