diff --git a/app/Console/Commands/SyncMediaCommand.php b/app/Console/Commands/SyncMediaCommand.php index e3a2f4c6..91b98bbd 100644 --- a/app/Console/Commands/SyncMediaCommand.php +++ b/app/Console/Commands/SyncMediaCommand.php @@ -107,7 +107,7 @@ class SyncMediaCommand extends Command $this->ignored++; } elseif ($result === FileSynchronizer::SYNC_RESULT_BAD_FILE) { if ($this->option('verbose')) { - $this->error(PHP_EOL . "'$name' is not a valid media file: ".$reason); + $this->error(PHP_EOL."'$name' is not a valid media file: ".$reason); } $this->invalid++; diff --git a/app/Services/ApiConsumerInterface.php b/app/Services/ApiConsumerInterface.php index 03233912..11f5670c 100644 --- a/app/Services/ApiConsumerInterface.php +++ b/app/Services/ApiConsumerInterface.php @@ -5,6 +5,8 @@ namespace App\Services; interface ApiConsumerInterface { public function getEndpoint(): string; + public function getKey(): ?string; + public function getSecret(): ?string; } diff --git a/app/Services/FileSynchronizer.php b/app/Services/FileSynchronizer.php index 177d68a5..6e9d3902 100644 --- a/app/Services/FileSynchronizer.php +++ b/app/Services/FileSynchronizer.php @@ -9,8 +9,8 @@ use App\Repositories\SongRepository; use Exception; use getID3; use getid3_lib; -use InvalidArgumentException; use Illuminate\Contracts\Cache\Repository as Cache; +use InvalidArgumentException; use SplFileInfo; use Symfony\Component\Finder\Finder; @@ -69,8 +69,7 @@ class FileSynchronizer SongRepository $songRepository, Cache $cache, Finder $finder - ) - { + ) { $this->getID3 = $getID3; $this->mediaMetadataService = $mediaMetadataService; $this->helperService = $helperService; @@ -179,6 +178,7 @@ class FileSynchronizer return $props; } + /** * Sync the song with all available media info against the database. * @@ -289,7 +289,7 @@ class FileSynchronizer private function getCoverFileUnderSameDirectory(): ?string { // As directory scanning can be expensive, we cache and reuse the result. - return $this->cache->remember(md5($this->filePath . '_cover'), 24 * 60, function (): ?string { + return $this->cache->remember(md5($this->filePath.'_cover'), 24 * 60, function (): ?string { $matches = array_keys(iterator_to_array( $this->finder->create() ->depth(0) @@ -312,7 +312,6 @@ class FileSynchronizer }); } - /** * Determine if the file is new (its Song record can't be found in the database). */ diff --git a/app/Services/MediaSyncService.php b/app/Services/MediaSyncService.php index 4f4d9c7e..167349c9 100644 --- a/app/Services/MediaSyncService.php +++ b/app/Services/MediaSyncService.php @@ -7,7 +7,6 @@ use App\Events\LibraryChanged; use App\Libraries\WatchRecord\WatchRecordInterface; use App\Models\Album; use App\Models\Artist; -use App\Models\Setting; use App\Models\Song; use App\Repositories\AlbumRepository; use App\Repositories\ArtistRepository; @@ -243,7 +242,7 @@ class MediaSyncService } if (config('koel.memory_limit')) { - ini_set('memory_limit', config('koel.memory_limit') . 'M'); + ini_set('memory_limit', config('koel.memory_limit').'M'); } } diff --git a/app/Services/Streamers/XAccelRedirectStreamer.php b/app/Services/Streamers/XAccelRedirectStreamer.php index d032d9ad..540d9f0e 100644 --- a/app/Services/Streamers/XAccelRedirectStreamer.php +++ b/app/Services/Streamers/XAccelRedirectStreamer.php @@ -19,7 +19,7 @@ class XAccelRedirectStreamer extends Streamer implements DirectStreamerInterface header('X-Media-Root: '.Setting::get('media_path')); header("X-Accel-Redirect: /media/$relativePath"); header("Content-Type: {$this->contentType}"); - header('Content-Disposition: inline; filename="' . basename($this->song->path) . '"'); + header('Content-Disposition: inline; filename="'.basename($this->song->path).'"'); exit; } diff --git a/tests/Integration/Services/FileSynchronizerTest.php b/tests/Integration/Services/FileSynchronizerTest.php index e79bf5f1..6368a832 100644 --- a/tests/Integration/Services/FileSynchronizerTest.php +++ b/tests/Integration/Services/FileSynchronizerTest.php @@ -18,7 +18,7 @@ class FileSynchronizerTest extends TestCase public function testGetFileInfo() { - $info = $this->fileSynchronizer->setFile(__DIR__ . '/../../songs/full.mp3')->getFileInfo(); + $info = $this->fileSynchronizer->setFile(__DIR__.'/../../songs/full.mp3')->getFileInfo(); $expectedData = [ 'artist' => 'Koel', @@ -29,7 +29,7 @@ class FileSynchronizerTest extends TestCase 'disc' => 3, 'lyrics' => "Foo\rbar", 'cover' => [ - 'data' => file_get_contents(__DIR__ . '/../../blobs/cover.png'), + 'data' => file_get_contents(__DIR__.'/../../blobs/cover.png'), 'image_mime' => 'image/png', 'image_width' => 512, 'image_height' => 512, @@ -38,8 +38,8 @@ class FileSynchronizerTest extends TestCase 'description' => '', 'datalength' => 7627, ], - 'path' => __DIR__ . '/../../songs/full.mp3', - 'mtime' => filemtime(__DIR__ . '/../../songs/full.mp3'), + 'path' => __DIR__.'/../../songs/full.mp3', + 'mtime' => filemtime(__DIR__.'/../../songs/full.mp3'), 'albumartist' => '', ]; @@ -50,7 +50,7 @@ class FileSynchronizerTest extends TestCase /** @test */ public function song_without_a_title_tag_has_file_name_as_the_title() { - $this->fileSynchronizer->setFile(__DIR__ . '/../../songs/blank.mp3'); + $this->fileSynchronizer->setFile(__DIR__.'/../../songs/blank.mp3'); self::assertSame('blank', $this->fileSynchronizer->getFileInfo()['title']); } }