A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: pint
aminnausina2f7f4eddf7a
diff --git a/app/Data/Subtitles/SubtitleScanTarget.php b/app/Data/Subtitles/SubtitleScanTarget.phpindex 41d8e3a1..66af35cc 100644--- a/app/Data/Subtitles/SubtitleScanTarget.php+++ b/app/Data/Subtitles/SubtitleScanTarget.php@@ -6,6 +6,5 @@ class SubtitleScanTarget {public function __construct(public readonly string $uuid,public readonly bool $fileUpdated,- ) {- }+ ) {}}diff --git a/app/Jobs/Utility/Subtitles/ScanSubtitles.php b/app/Jobs/Utility/Subtitles/ScanSubtitles.phpindex 1df2362d..85cc8cbd 100644--- a/app/Jobs/Utility/Subtitles/ScanSubtitles.php+++ b/app/Jobs/Utility/Subtitles/ScanSubtitles.php@@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Log;class ScanSubtitles extends ManagedSubTask {private array $targets;+private string $folderPath;private bool $scanExternal;@@ -68,7 +69,7 @@ class ScanSubtitles extends ManagedSubTask {* generate font information (as a json on metadata?)*/private function handleScanSubtitles(SubtitleScanner $subtitleScanner, SubtitleManager $manager): string {- $summary = "Scanning for subtitle tracks on " . count($this->targets) . " targets";+ $summary = 'Scanning for subtitle tracks on ' . count($this->targets) . ' targets';$batchTransactions = [];$scannedUuids = [];@@ -81,7 +82,6 @@ class ScanSubtitles extends ManagedSubTask {? $subtitleScanner->findExternalSubtitlesInDirectory($this->folderPath): [];-foreach ($this->targets as $target) {$subtitleTransactions = [];@@ -92,17 +92,19 @@ class ScanSubtitles extends ManagedSubTask {$media = $metadata?->video;if (is_null($metadata)) {- Log::error("Metadata missing when scanning for subtitles", ["uuid" => $uuid]);+ Log::error('Metadata missing when scanning for subtitles', ['uuid' => $uuid]);+continue;}if (is_null($media)) {- Log::error("Media file missing on metadata instance when scanning for subtitles", ["uuid" => $metadata->uuid, "title" => $metadata->title]);- $summary .= "\n\nMedia file missing for " . $metadata->title . " with uuid " . $metadata->uuid;+ Log::error('Media file missing on metadata instance when scanning for subtitles', ['uuid' => $metadata->uuid, 'title' => $metadata->title]);+ $summary .= "\n\nMedia file missing for " . $metadata->title . ' with uuid ' . $metadata->uuid;+continue;}- $manager->purgeSubtitles($metadata, externalOnly: !$fileUpdated); // only purge external subtitle files if the file was not updated. Getting to this point+ $manager->purgeSubtitles($metadata, externalOnly: ! $fileUpdated); // only purge external subtitle files if the file was not updated. Getting to this point// absolute file path in storage$filePath = VerifyFiles::getAbsoluteMediaPath($media);@@ -117,16 +119,16 @@ class ScanSubtitles extends ManagedSubTask {}// External Subtitles - directory scanned once per job and filtered per media file- if (!empty($externalSubtitles)) {+ if (! empty($externalSubtitles)) {$relevantExternal = array_filter($externalSubtitles,- fn($sub) => strtolower($sub['media_filename']) === strtolower($fileName)+ fn ($sub) => strtolower($sub['media_filename']) === strtolower($fileName));$subtitleTransactions = array_merge($subtitleTransactions, $subtitleScanner->buildSubtitleTransactions($uuid, $relevantExternal));}- if (!empty($subtitleTransactions)) {+ if (! empty($subtitleTransactions)) {$summary .= "\n\nFound " . count($subtitleTransactions) . ' subtitle track(s) for uuid ' . $uuid;$batchTransactions = array_merge($batchTransactions, $subtitleTransactions);}@@ -135,7 +137,7 @@ class ScanSubtitles extends ManagedSubTask {try {DB::transaction(function () use ($batchTransactions, $scannedUuids) {- if (!empty($batchTransactions)) {+ if (! empty($batchTransactions)) {Subtitle::upsert($batchTransactions, ['metadata_uuid', 'source_key'], ['language', 'title', 'codec', 'is_default', 'is_forced', 'external_path']);}diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.phpindex 8b0aef49..a588d14e 100755--- a/app/Jobs/VerifyFiles.php+++ b/app/Jobs/VerifyFiles.php@@ -20,6 +20,7 @@ use Symfony\Component\Process\Process;class VerifyFiles extends ManagedSubTask {protected $subtitleScanChain = [];+protected $embedChain = [];protected $scannedDirectories = []; // TODO: this should really go in the indexer or a broken down part of the indexer@@ -45,7 +46,9 @@ class VerifyFiles extends ManagedSubTask {$summary = $this->verifyFiles($taskService);foreach ($this->scannedDirectories as $folderPath => $dirData) {- if (empty($dirData['targets'])) continue;+ if (empty($dirData['targets'])) {+ continue;+ }$this->subtitleScanChain[] = new ScanSubtitles(taskId: $this->taskId,@@ -226,7 +229,7 @@ class VerifyFiles extends ManagedSubTask {// #endregionif (! $is_audio && (is_null($metadata->resolution_height) || is_null($metadata->codec) || $fileUpdated)) {- $this->confirmMetadata($filePath, "Not audio and missing resolution or codec or because fileUpdated was {" . ($fileUpdated ? 'true' : 'false') . "}");+ $this->confirmMetadata($filePath, 'Not audio and missing resolution or codec or because fileUpdated was {' . ($fileUpdated ? 'true' : 'false') . '}');foreach ($this->fileMetaData['streams'] as $stream) {if (! isset($stream['codec_type']) || $stream['codec_type'] !== 'video' || ! isset($stream['width'])) {continue;