fix(utils): Improve song name formatting

- Remove unnecessary characters from song name based on OS - Use a more concise format for the return string - Ensure proper formatting and cleanup of artist and song name - Closes #811
guanguans · Oct 10, 2024 · b82a9e2 · b82a9e2
1 parent b1937cc
commit b82a9e2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/app/Commands/MusicCommand.php b/app/Commands/MusicCommand.php
@@ -148,6 +148,9 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
     }
 
     /**
+     * @psalm-suppress InvalidReturnType
+     * @psalm-suppress InvalidReturnStatement
+     *
      * @template TValue
      *
      * @param callable(): TValue $callback

diff --git a/app/Support/Utils.php b/app/Support/Utils.php
@@ -46,10 +46,19 @@ public static function savedPathFor(array $song, ?string $savedDir = null, strin
         }
 
         return \sprintf(
-            '%s%s - %s.%s',
+            '%s%s.%s',
             $savedDir,
-            implode(',', $song['artist']),
-            preg_replace('/[\\\|\/|\:|\*|\?|\"|\<|\>|\|| ]+/', ' ', $song['name']),
+            str(\sprintf('%s - %s', implode(',', $song['artist']), $song['name']))
+                ->replace(
+                    match (\PHP_OS_FAMILY) {
+                        'Windows' => ['<', '>', '/', '\\', '|', ':', '"', '?', '*'],
+                        'Darwin' => [':'],
+                        default => [],
+                    },
+                    '',
+                )
+                ->ltrim('.')
+                ->toString(),
             preg_replace('/\?.*/', '', pathinfo((string) $song['url'], \PATHINFO_EXTENSION)) ?: $defaultExt
         );
     }