Merge branch 'release/1.2.7' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Transcoder Changelog
 
+## 1.2.7 - 2019.11.12
+### Changed
+* Fixed issues with the `synchronous` and `stripMetadata` options
+
 ## 1.2.6 - 2019.11.11
 ### Added
 * Added trimming to audio transcoding

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-transcoder",
     "description": "Transcode video & audio files to various formats, and provide video thumbnails",
     "type": "craft-plugin",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "keywords": [
         "craft",
         "cms",

src/services/Transcode.php

@@ -386,16 +386,24 @@ public function getAudioUrl($filePath, $audioOptions): string
 
             // Assemble the destination path and final ffmpeg command
             $destAudioPath .= $destAudioFile;
-            
-            if ($audioOptions['stripMetadata']) {
+            // Handle the `stripMetadata` setting
+            $stripMetadata = false;
+            if (!empty($audioOptions['stripMetadata'])) {
+                $stripMetadata = $audioOptions['stripMetadata'];
+            }
+            if ($stripMetadata) {
                 $ffmpegCmd .= ' -map_metadata -1 ';
             }
-            
+            // Add the file format
             $ffmpegCmd .= ' -f '
                 .$thisEncoder['fileFormat']
                 .' -y '.escapeshellarg($destAudioPath);
-            
-            if (!$audioOptions['synchronous']) {
+            // Handle the `synchronous` setting
+            $synchronous = false;
+            if (!empty($audioOptions['synchronous'])) {
+                $synchronous = $audioOptions['synchronous'];
+            }
+            if (!$synchronous) {
                 $ffmpegCmd .=' 1> '.$progressFile.' 2>&1 & echo $!';
                 // Make sure there isn't a lockfile for this audio file already
                 $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock';
@@ -418,8 +426,8 @@ public function getAudioUrl($filePath, $audioOptions): string
             } else {
                 // Kick off the transcoding
                 $this->executeShellCommand($ffmpegCmd);
-                
-                if ($audioOptions['synchronous']) {
+
+                if ($synchronous) {
                     Craft::info($ffmpegCmd, __METHOD__);
                     $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
                     $result = Craft::getAlias($url).$destAudioFile;