Skip to content

A self-hosted media server and file management system

fix format issues

aminnausinfe83fde4c1d1
diff --git a/app/Jobs/EmbedUidInMetadata.php b/app/Jobs/EmbedUidInMetadata.php
index 6e02c716..1b7ab166 100644
--- a/app/Jobs/EmbedUidInMetadata.php
+++ b/app/Jobs/EmbedUidInMetadata.php
@@ -178,6 +178,8 @@ class EmbedUidInMetadata implements ShouldQueue {
}
private function getUidFromMetadata($filePath) {
+ $ext = pathinfo($filePath, PATHINFO_EXTENSION);
+
$command = [
'ffprobe',
'-v',
@@ -185,6 +187,7 @@ class EmbedUidInMetadata implements ShouldQueue {
'-print_format',
'json',
'-show_format',
+ '-show_streams',
$filePath,
];
@@ -199,6 +202,9 @@ class EmbedUidInMetadata implements ShouldQueue {
$output = $process->getOutput(); // Decode JSON output
$metadata = json_decode($output, true);
+ if ($ext === 'ogg') {
+ $metadata['format'] = $metadata['streams'][0] ?? [];
+ }
dump($metadata);
return isset($metadata['format']['tags']['uid']) ? $metadata['format']['tags']['uid'] : (isset($metadata['format']['tags']['UID']) ? $metadata['format']['tags']['UID'] : null);
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index 83f4e650..f4a1e52d 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -273,6 +273,8 @@ class VerifyFiles implements ShouldQueue {
// $tags = $ffprobe->format($filePath)->get('tags'); // extracts file information
// return isset($tags['uid']) ? $tags['uid'] : (isset($tags['UID']) ? $tags['UID'] : null);
+ $ext = pathinfo($filePath, PATHINFO_EXTENSION);
+
$command = [
'ffprobe',
'-v',
@@ -280,6 +282,7 @@ class VerifyFiles implements ShouldQueue {
'-print_format',
'json',
'-show_format',
+ '-show_streams',
$filePath,
];
@@ -293,6 +296,9 @@ class VerifyFiles implements ShouldQueue {
$output = $process->getOutput(); // Decode JSON output
$metadata = json_decode($output, true);
+ if ($ext === 'ogg') {
+ $metadata['format'] = $metadata['streams'][0] ?? [];
+ }
return $metadata['format'];
} catch (\Throwable $th) {
@@ -309,9 +315,8 @@ class VerifyFiles implements ShouldQueue {
$description = $metadata['tags']['artist'] ?? '';
$description = ($description ? ($description . ' - ') : '') . ($metadata['tags']['album'] ?? '');
- $season = $metadata['tags']['disc'] ?? null;
- $episode = $metadata['tags']['track'] ?? null;
-
+ $season = $metadata['tags']['disc'] ? (int) explode($metadata['tags']['disc'], '/')[0] ?? null : null;
+ $episode = $metadata['tags']['track'] ? (int) explode($metadata['tags']['track'], '/')[0] ?? null : null;
return ['description' => $description === '' ? null : $description, 'season' => $season, 'episode' => $episode];
}