From 205e034174e59c4b07c02ceac9f0b33d526c9079 Mon Sep 17 00:00:00 2001 From: Peter Deltchev Date: Sat, 12 Sep 2015 20:45:56 -0700 Subject: [PATCH] T357, T350: Restore updates from rPFf088badebbbb. --- app/Console/Commands/ImportMLPMA.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/ImportMLPMA.php b/app/Console/Commands/ImportMLPMA.php index ca4fc8a2..63d7b87d 100644 --- a/app/Console/Commands/ImportMLPMA.php +++ b/app/Console/Commands/ImportMLPMA.php @@ -42,7 +42,7 @@ class ImportMLPMA extends Command * * @var array */ - protected $ignoredExtensions = ['db', 'jpg', 'png', 'txt', 'rtf', 'wma']; + protected $ignoredExtensions = ['db', 'jpg', 'png', 'txt', 'rtf', 'wma', 'wmv']; /** * Used to stop the import process when a SIGINT is received. @@ -83,8 +83,8 @@ class ImportMLPMA extends Command { pcntl_signal(SIGINT, [$this, 'handleInterrupt']); - $mlpmaPath = Config::get('ponyfm.files_directory') . 'mlpma'; - $tmpPath = Config::get('ponyfm.files_directory') . 'tmp'; + $mlpmaPath = Config::get('ponyfm.files_directory') . '/mlpma'; + $tmpPath = Config::get('ponyfm.files_directory') . '/tmp'; if (!File::exists($tmpPath)) { File::makeDirectory($tmpPath); @@ -166,9 +166,13 @@ class ImportMLPMA extends Command } elseif (Str::lower($file->getExtension()) === 'flac') { list($parsedTags, $rawTags) = $this->getVorbisTags($allTags); + } elseif (Str::lower($file->getExtension()) === 'wav') { + list($parsedTags, $rawTags) = $this->getAtomTags($allTags); + } - //========================================================================================================== + + //========================================================================================================== // Determine the release date. //========================================================================================================== $modifiedDate = Carbon::createFromTimeStampUTC(File::lastModified($file->getPathname()));