nystudio107 / craft-transcoder

src/services/Transcode.php

Spacing +123 added lines, -123 removed lines

@@ -96,31 +96,31 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destVideoPath = Craft::getAlias($settings['transcoderPaths']['video']);
+            $destVideoPath = Craft::getAlias($settings[ 'transcoderPaths' ][ 'video' ]);
             $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
 
             // Get the video encoder presets to use
-            $videoEncoders = $settings['videoEncoders'];
-            $thisEncoder = $videoEncoders[$videoOptions['videoEncoder']];
+            $videoEncoders = $settings[ 'videoEncoders' ];
+            $thisEncoder = $videoEncoders[ $videoOptions[ 'videoEncoder' ] ];
 
-            $videoOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+            $videoOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
             // Build the basic command for ffmpeg
-            $ffmpegCmd = $settings['ffmpegPath']
-                .' -i '.escapeshellarg($filePath)
-                .' -vcodec '.$thisEncoder['videoCodec']
-                .' '.$thisEncoder['videoCodecOptions']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
+                .' -i ' . escapeshellarg($filePath)
+                .' -vcodec ' . $thisEncoder[ 'videoCodec' ]
+                .' ' . $thisEncoder[ 'videoCodecOptions' ]
                 .' -bufsize 1000k'
                 .' -threads 0';
 
             // Set the framerate if desired
-            if (!empty($videoOptions['videoFrameRate'])) {
-                $ffmpegCmd .= ' -r '.$videoOptions['videoFrameRate'];
+            if (!empty($videoOptions[ 'videoFrameRate' ])) {
+                $ffmpegCmd .= ' -r ' . $videoOptions[ 'videoFrameRate' ];
             }
 
             // Set the bitrate if desired
-            if (!empty($videoOptions['videoBitRate'])) {
-                $ffmpegCmd .= ' -b:v '.$videoOptions['videoBitRate'].' -maxrate '.$videoOptions['videoBitRate'];
+            if (!empty($videoOptions[ 'videoBitRate' ])) {
+                $ffmpegCmd .= ' -b:v ' . $videoOptions[ 'videoBitRate' ] . ' -maxrate ' . $videoOptions[ 'videoBitRate' ];
             }
 
             // Adjust the scaling if desired
@@ -130,25 +130,25 @@ 
             );
 
             // Handle any audio transcoding
-            if (empty($videoOptions['audioBitRate'])
-                && empty($videoOptions['audioSampleRate'])
-                && empty($videoOptions['audioChannels'])
+            if (empty($videoOptions[ 'audioBitRate' ])
+                && empty($videoOptions[ 'audioSampleRate' ])
+                && empty($videoOptions[ 'audioChannels' ])
             ) {
                 // Just copy the audio if no options are provided
                 $ffmpegCmd .= ' -c:a copy';
             } else {
                 // Do audio transcoding based on the settings
-                $ffmpegCmd .= ' -acodec '.$thisEncoder['audioCodec'];
-                if (!empty($videoOptions['audioBitRate'])) {
-                    $ffmpegCmd .= ' -b:a '.$videoOptions['audioBitRate'];
+                $ffmpegCmd .= ' -acodec ' . $thisEncoder[ 'audioCodec' ];
+                if (!empty($videoOptions[ 'audioBitRate' ])) {
+                    $ffmpegCmd .= ' -b:a ' . $videoOptions[ 'audioBitRate' ];
                 }
-                if (!empty($videoOptions['audioSampleRate'])) {
-                    $ffmpegCmd .= ' -ar '.$videoOptions['audioSampleRate'];
+                if (!empty($videoOptions[ 'audioSampleRate' ])) {
+                    $ffmpegCmd .= ' -ar ' . $videoOptions[ 'audioSampleRate' ];
                 }
-                if (!empty($videoOptions['audioChannels'])) {
-                    $ffmpegCmd .= ' -ac '.$videoOptions['audioChannels'];
+                if (!empty($videoOptions[ 'audioChannels' ])) {
+                    $ffmpegCmd .= ' -ac ' . $videoOptions[ 'audioChannels' ];
                 }
-                $ffmpegCmd .= ' '.$thisEncoder['audioCodecOptions'];
+                $ffmpegCmd .= ' ' . $thisEncoder[ 'audioCodecOptions' ];
             }
 
             // Create the directory if it isn't there already
@@ -163,17 +163,17 @@ 
             $destVideoFile = $this->getFilename($filePath, $videoOptions);
 
             // File to store the video encoding progress in
-            $progressFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.progress';
+            $progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destVideoFile . '.progress';
 
             // Assemble the destination path and final ffmpeg command
             $destVideoPath .= $destVideoFile;
             $ffmpegCmd .= ' -f '
-                .$thisEncoder['fileFormat']
-                .' -y '.escapeshellarg($destVideoPath)
-                .' 1> '.$progressFile.' 2>&1 & echo $!';
+                .$thisEncoder[ 'fileFormat' ]
+                .' -y ' . escapeshellarg($destVideoPath)
+                .' 1> ' . $progressFile . ' 2>&1 & echo $!';
 
             // Make sure there isn't a lockfile for this video already
-            $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.lock';
+            $lockFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destVideoFile . '.lock';
             $oldPid = @file_get_contents($lockFile);
             if ($oldPid !== false) {
                 exec("ps $oldPid", $ProcessState);
@@ -187,11 +187,11 @@ 
 
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destVideoPath) && (filemtime($destVideoPath) >= filemtime($filePath))) {
-                $result = Craft::getAlias($settings['transcoderUrls']['video']).$destVideoFile;
+                $result = Craft::getAlias($settings[ 'transcoderUrls' ][ 'video' ]) . $destVideoFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
-                Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
+                Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp
                 file_put_contents($lockFile, $pid);
@@ -220,13 +220,13 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destThumbnailPath = Craft::getAlias($settings['transcoderPaths']['thumbnail']);
+            $destThumbnailPath = Craft::getAlias($settings[ 'transcoderPaths' ][ 'thumbnail' ]);
 
             $thumbnailOptions = $this->coalesceOptions('defaultThumbnailOptions', $thumbnailOptions);
 
             // Build the basic command for ffmpeg
-            $ffmpegCmd = $settings['ffmpegPath']
-                .' -i '.escapeshellarg($filePath)
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
+                .' -i ' . escapeshellarg($filePath)
                 .' -vcodec mjpeg'
                 .' -vframes 1';
 
@@ -237,9 +237,9 @@ 
             );
 
             // Set the timecode to get the thumbnail from if desired
-            if (!empty($thumbnailOptions['timeInSecs'])) {
-                $timeCode = gmdate('H:i:s', $thumbnailOptions['timeInSecs']);
-                $ffmpegCmd .= ' -ss '.$timeCode.'.00';
+            if (!empty($thumbnailOptions[ 'timeInSecs' ])) {
+                $timeCode = gmdate('H:i:s', $thumbnailOptions[ 'timeInSecs' ]);
+                $ffmpegCmd .= ' -ss ' . $timeCode . '.00';
             }
 
             // Create the directory if it isn't there already
@@ -255,7 +255,7 @@ 
 
             // Assemble the destination path and final ffmpeg command
             $destThumbnailPath .= $destThumbnailFile;
-            $ffmpegCmd .= ' -f image2 -y '.escapeshellarg($destThumbnailPath).' >/dev/null 2>/dev/null &';
+            $ffmpegCmd .= ' -f image2 -y ' . escapeshellarg($destThumbnailPath) . ' >/dev/null 2>/dev/null &';
 
             // If the thumbnail file already exists, return it.  Otherwise, generate it and return it
             if (!file_exists($destThumbnailPath)) {
@@ -264,7 +264,7 @@ 
                     $shellOutput = $this->executeShellCommand($ffmpegCmd);
                     Craft::info($ffmpegCmd, __METHOD__);
                 } else {
-                    Craft::info('Thumbnail does not exist, but not asked to generate it: '.$filePath, __METHOD__);
+                    Craft::info('Thumbnail does not exist, but not asked to generate it: ' . $filePath, __METHOD__);
 
                     // The file doesn't exist, and we weren't asked to generate it
                     return false;
@@ -274,7 +274,7 @@ 
             if ($asPath) {
                 $result = $destThumbnailPath;
             } else {
-                $result = Craft::getAlias($settings['transcoderUrls']['thumbnail']).$destThumbnailFile;
+                $result = Craft::getAlias($settings[ 'transcoderUrls' ][ 'thumbnail' ]) . $destThumbnailFile;
             }
         }
 
@@ -298,37 +298,37 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destAudioPath = Craft::getAlias($settings['transcoderPaths']['audio']);
+            $destAudioPath = Craft::getAlias($settings[ 'transcoderPaths' ][ 'audio' ]);
 
             $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
 
             // Get the audio encoder presets to use
-            $audioEncoders = $settings['audioEncoders'];
-            $thisEncoder = $audioEncoders[$audioOptions['audioEncoder']];
+            $audioEncoders = $settings[ 'audioEncoders' ];
+            $thisEncoder = $audioEncoders[ $audioOptions[ 'audioEncoder' ] ];
 
-            $audioOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+            $audioOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
             // Build the basic command for ffmpeg
-            $ffmpegCmd = $settings['ffmpegPath']
-                .' -i '.escapeshellarg($filePath)
-                .' -acodec '.$thisEncoder['audioCodec']
-                .' '.$thisEncoder['audioCodecOptions']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
+                .' -i ' . escapeshellarg($filePath)
+                .' -acodec ' . $thisEncoder[ 'audioCodec' ]
+                .' ' . $thisEncoder[ 'audioCodecOptions' ]
                 .' -bufsize 1000k'
                 .' -threads 0';
 
             // Set the bitrate if desired
-            if (!empty($audioOptions['audioBitRate'])) {
-                $ffmpegCmd .= ' -b:a '.$audioOptions['audioBitRate'];
+            if (!empty($audioOptions[ 'audioBitRate' ])) {
+                $ffmpegCmd .= ' -b:a ' . $audioOptions[ 'audioBitRate' ];
             }
             // Set the sample rate if desired
-            if (!empty($audioOptions['audioSampleRate'])) {
-                $ffmpegCmd .= ' -ar '.$audioOptions['audioSampleRate'];
+            if (!empty($audioOptions[ 'audioSampleRate' ])) {
+                $ffmpegCmd .= ' -ar ' . $audioOptions[ 'audioSampleRate' ];
             }
             // Set the audio channels if desired
-            if (!empty($audioOptions['audioChannels'])) {
-                $ffmpegCmd .= ' -ac '.$audioOptions['audioChannels'];
+            if (!empty($audioOptions[ 'audioChannels' ])) {
+                $ffmpegCmd .= ' -ac ' . $audioOptions[ 'audioChannels' ];
             }
-            $ffmpegCmd .= ' '.$thisEncoder['audioCodecOptions'];
+            $ffmpegCmd .= ' ' . $thisEncoder[ 'audioCodecOptions' ];
 
 
             // Create the directory if it isn't there already
@@ -343,17 +343,17 @@ 
             $destAudioFile = $this->getFilename($filePath, $audioOptions);
 
             // File to store the audio encoding progress in
-            $progressFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.progress';
+            $progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destAudioFile . '.progress';
 
             // Assemble the destination path and final ffmpeg command
             $destAudioPath .= $destAudioFile;
             $ffmpegCmd .= ' -f '
-                .$thisEncoder['fileFormat']
-                .' -y '.escapeshellarg($destAudioPath)
-                .' 1> '.$progressFile.' 2>&1 & echo $!';
+                .$thisEncoder[ 'fileFormat' ]
+                .' -y ' . escapeshellarg($destAudioPath)
+                .' 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';
+            $lockFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destAudioFile . '.lock';
             $oldPid = @file_get_contents($lockFile);
             if ($oldPid !== false) {
                 exec("ps $oldPid", $ProcessState);
@@ -367,11 +367,11 @@ 
 
             // If the audio file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destAudioPath) && (filemtime($destAudioPath) >= filemtime($filePath))) {
-                $result = Craft::getAlias($settings['transcoderUrls']['audio']).$destAudioFile;
+                $result = Craft::getAlias($settings[ 'transcoderUrls' ][ 'audio' ]) . $destAudioFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
-                Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
+                Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp
                 file_put_contents($lockFile, $pid);
@@ -398,10 +398,10 @@ 
 
         if (!empty($filePath)) {
             // Build the basic command for ffprobe
-            $ffprobeOptions = $settings['ffprobeOptions'];
-            $ffprobeCmd = $settings['ffprobePath']
-                .' '.$ffprobeOptions
-                .' '.escapeshellarg($filePath);
+            $ffprobeOptions = $settings[ 'ffprobeOptions' ];
+            $ffprobeCmd = $settings[ 'ffprobePath' ]
+                .' ' . $ffprobeOptions
+                .' ' . escapeshellarg($filePath);
 
             $shellOutput = $this->executeShellCommand($ffprobeCmd);
             Craft::info($ffprobeCmd, __METHOD__);
@@ -410,24 +410,24 @@ 
 
             // Trim down the arrays to just a summary
             if ($summary && !empty($result)) {
-                $summaryResult = [];
+                $summaryResult = [ ];
                 foreach ($result as $topLevelKey => $topLevelValue) {
                     switch ($topLevelKey) {
                         // Format info
                         case 'format':
-                            foreach (self::INFO_SUMMARY['format'] as $settingKey => $settingValue) {
-                                if (!empty($topLevelValue[$settingKey])) {
-                                    $summaryResult[$settingValue] = $topLevelValue[$settingKey];
+                            foreach (self::INFO_SUMMARY[ 'format' ] as $settingKey => $settingValue) {
+                                if (!empty($topLevelValue[ $settingKey ])) {
+                                    $summaryResult[ $settingValue ] = $topLevelValue[ $settingKey ];
                                 }
                             }
                             break;
                         // Stream info
                         case 'streams':
                             foreach ($topLevelValue as $stream) {
-                                $infoSummaryType = $stream['codec_type'];
-                                foreach (self::INFO_SUMMARY[$infoSummaryType] as $settingKey => $settingValue) {
-                                    if (!empty($stream[$settingKey])) {
-                                        $summaryResult[$settingValue] = $stream[$settingKey];
+                                $infoSummaryType = $stream[ 'codec_type' ];
+                                foreach (self::INFO_SUMMARY[ $infoSummaryType ] as $settingKey => $settingValue) {
+                                    if (!empty($stream[ $settingKey ])) {
+                                        $summaryResult[ $settingValue ] = $stream[ $settingKey ];
                                     }
                                 }
                             }
@@ -438,11 +438,11 @@ 
                     }
                 }
                 // Handle cases where the framerate is returned as XX/YY
-                if (!empty($summaryResult['videoFrameRate'])
-                    && (strpos($summaryResult['videoFrameRate'], '/') !== false)
+                if (!empty($summaryResult[ 'videoFrameRate' ])
+                    && (strpos($summaryResult[ 'videoFrameRate' ], '/') !== false)
                 ) {
-                    $parts = explode('/', $summaryResult['videoFrameRate']);
-                    $summaryResult['videoFrameRate'] = (float)$parts[0] / (float)$parts[1];
+                    $parts = explode('/', $summaryResult[ 'videoFrameRate' ]);
+                    $summaryResult[ 'videoFrameRate' ] = (float) $parts[ 0 ] / (float) $parts[ 1 ];
                 }
                 $result = $summaryResult;
             }
@@ -465,10 +465,10 @@ 
         $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
 
         // Get the video encoder presets to use
-        $videoEncoders = $settings['videoEncoders'];
-        $thisEncoder = $videoEncoders[$videoOptions['videoEncoder']];
+        $videoEncoders = $settings[ 'videoEncoders' ];
+        $thisEncoder = $videoEncoders[ $videoOptions[ 'videoEncoder' ] ];
 
-        $videoOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+        $videoOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
         return $this->getFilename($filePath, $videoOptions);
     }
@@ -487,10 +487,10 @@ 
         $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
 
         // Get the video encoder presets to use
-        $audioEncoders = $settings['audioEncoders'];
-        $thisEncoder = $audioEncoders[$audioOptions['audioEncoder']];
+        $audioEncoders = $settings[ 'audioEncoders' ];
+        $thisEncoder = $audioEncoders[ $audioOptions[ 'audioEncoder' ] ];
 
-        $audioOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+        $audioOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
         return $this->getFilename($filePath, $audioOptions);
     }
@@ -509,10 +509,10 @@ 
         $gifOptions = $this->coalesceOptions('defaultGifOptions', $gifOptions);
 
         // Get the video encoder presets to use
-        $videoEncoders = $settings['videoEncoders'];
-        $thisEncoder = $videoEncoders[$gifOptions['videoEncoder']];
+        $videoEncoders = $settings[ 'videoEncoders' ];
+        $thisEncoder = $videoEncoders[ $gifOptions[ 'videoEncoder' ] ];
 
-        $gifOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+        $gifOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
         return $this->getFilename($filePath, $gifOptions);
     }
@@ -555,22 +555,22 @@ 
 
         if (!empty($filePath)) {
             // Dest path
-            $destVideoPath = Craft::getAlias($settings['transcoderPaths']['gif']);
+            $destVideoPath = Craft::getAlias($settings[ 'transcoderPaths' ][ 'gif' ]);
 
             // Options
             $gifOptions = $this->coalesceOptions('defaultGifOptions', $gifOptions);
 
             // Get the video encoder presets to use
-            $videoEncoders = $settings['videoEncoders'];
-            $thisEncoder = $videoEncoders[$gifOptions['videoEncoder']];
-            $gifOptions['fileSuffix'] = $thisEncoder['fileSuffix'];
+            $videoEncoders = $settings[ 'videoEncoders' ];
+            $thisEncoder = $videoEncoders[ $gifOptions[ 'videoEncoder' ] ];
+            $gifOptions[ 'fileSuffix' ] = $thisEncoder[ 'fileSuffix' ];
 
             // Build the basic command for ffmpeg
-            $ffmpegCmd = $settings['ffmpegPath']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
                 .' -f gif'
-                .' -i '.escapeshellarg($filePath)
-                .' -vcodec '.$thisEncoder['videoCodec']
-                .' '.$thisEncoder['videoCodecOptions'];
+                .' -i ' . escapeshellarg($filePath)
+                .' -vcodec ' . $thisEncoder[ 'videoCodec' ]
+                .' ' . $thisEncoder[ 'videoCodecOptions' ];
 
 
             // Create the directory if it isn't there already
@@ -585,16 +585,16 @@ 
             $destVideoFile = $this->getFilename($filePath, $gifOptions);
 
             // File to store the video encoding progress in
-            $progressFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.progress';
+            $progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destVideoFile . '.progress';
 
             // Assemble the destination path and final ffmpeg command
             $destVideoPath .= $destVideoFile;
             $ffmpegCmd .= ' '
-                .' -y '.escapeshellarg($destVideoPath)
-                .' 1> '.$progressFile.' 2>&1 & echo $!';
+                .' -y ' . escapeshellarg($destVideoPath)
+                .' 1> ' . $progressFile . ' 2>&1 & echo $!';
 
             // Make sure there isn't a lockfile for this video already
-            $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.lock';
+            $lockFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $destVideoFile . '.lock';
             $oldPid = @file_get_contents($lockFile);
             if ($oldPid !== false) {
                 exec("ps $oldPid", $ProcessState);
@@ -608,11 +608,11 @@ 
 
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destVideoPath) && (filemtime($destVideoPath) >= filemtime($filePath))) {
-                $result = Craft::getAlias($settings['transcoderUrls']['gif']).$destVideoFile;
+                $result = Craft::getAlias($settings[ 'transcoderUrls' ][ 'gif' ]) . $destVideoFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
-                Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
+                Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp
                 file_put_contents($lockFile, $pid);
@@ -639,32 +639,32 @@ 
         $error = '';
         if ($validator->validate($filePath, $error)) {
             $urlParts = parse_url($filePath);
-            $pathParts = pathinfo($urlParts['path']);
+            $pathParts = pathinfo($urlParts[ 'path' ]);
         } else {
             $pathParts = pathinfo($filePath);
         }
-        $fileName = $pathParts['filename'];
+        $fileName = $pathParts[ 'filename' ];
 
         // Add our options to the file name
         foreach ($options as $key => $value) {
             if (!empty($value)) {
                 $suffix = '';
-                if (!empty(self::SUFFIX_MAP[$key])) {
-                    $suffix = self::SUFFIX_MAP[$key];
+                if (!empty(self::SUFFIX_MAP[ $key ])) {
+                    $suffix = self::SUFFIX_MAP[ $key ];
                 }
                 if (\is_bool($value)) {
-                    $value = $value ? $key : 'no'.$key;
+                    $value = $value ? $key : 'no' . $key;
                 }
                 if (!\in_array($key, self::EXCLUDE_PARAMS, true)) {
-                    $fileName .= '_'.$value.$suffix;
+                    $fileName .= '_' . $value . $suffix;
                 }
             }
         }
         // See if we should use a hash instead
-        if ($settings['useHashedNames']) {
-            $fileName = $pathParts['filename'].md5($fileName);
+        if ($settings[ 'useHashedNames' ]) {
+            $fileName = $pathParts[ 'filename' ] . md5($fileName);
         }
-        $fileName .= $options['fileSuffix'];
+        $fileName .= $options[ 'fileSuffix' ];
 
         return $fileName;
     }
@@ -693,16 +693,16 @@ 
                 // If it's local, get a path to the file
                 if ($assetVolume instanceof Local) {
                     $sourcePath = rtrim($assetVolume->path, DIRECTORY_SEPARATOR);
-                    $sourcePath .= '' === $sourcePath ? '': DIRECTORY_SEPARATOR;
+                    $sourcePath .= '' === $sourcePath ? '' : DIRECTORY_SEPARATOR;
                     $folderPath = '';
                     try {
                         $folderPath = rtrim($asset->getFolder()->path, DIRECTORY_SEPARATOR);
                     } catch (InvalidConfigException $e) {
                         Craft::error($e->getMessage(), __METHOD__);
                     }
-                    $folderPath .= '' === $folderPath ? '': DIRECTORY_SEPARATOR;
+                    $folderPath .= '' === $folderPath ? '' : DIRECTORY_SEPARATOR;
 
-                    $filePath = $sourcePath.$folderPath.$asset->filename;
+                    $filePath = $sourcePath . $folderPath . $asset->filename;
                 } else {
                     // Otherwise, get a URL
                     $filePath = $asset->getUrl();
@@ -735,39 +735,39 @@ 
      */
     protected function addScalingFfmpegArgs($options, $ffmpegCmd): string
     {
-        if (!empty($options['width']) && !empty($options['height'])) {
+        if (!empty($options[ 'width' ]) && !empty($options[ 'height' ])) {
             // Handle "none", "crop", and "letterbox" aspectRatios
             $aspectRatio = '';
-            if (!empty($options['aspectRatio'])) {
-                switch ($options['aspectRatio']) {
+            if (!empty($options[ 'aspectRatio' ])) {
+                switch ($options[ 'aspectRatio' ]) {
                     // Scale to the appropriate aspect ratio, padding
                     case 'letterbox':
                         $letterboxColor = '';
-                        if (!empty($options['letterboxColor'])) {
-                            $letterboxColor = ':color='.$options['letterboxColor'];
+                        if (!empty($options[ 'letterboxColor' ])) {
+                            $letterboxColor = ':color=' . $options[ 'letterboxColor' ];
                         }
                         $aspectRatio = ':force_original_aspect_ratio=decrease'
-                            .',pad='.$options['width'].':'.$options['height'].':(ow-iw)/2:(oh-ih)/2'
+                            .',pad=' . $options[ 'width' ] . ':' . $options[ 'height' ] . ':(ow-iw)/2:(oh-ih)/2'
                             .$letterboxColor;
                         break;
                     // Scale to the appropriate aspect ratio, cropping
                     case 'crop':
                         $aspectRatio = ':force_original_aspect_ratio=increase'
-                            .',crop='.$options['width'].':'.$options['height'];
+                            .',crop=' . $options[ 'width' ] . ':' . $options[ 'height' ];
                         break;
                     // No aspect ratio scaling at all
                     default:
                         $aspectRatio = ':force_original_aspect_ratio=disable';
-                        $options['aspectRatio'] = 'none';
+                        $options[ 'aspectRatio' ] = 'none';
                         break;
                 }
             }
             $sharpen = '';
-            if (!empty($options['sharpen']) && ($options['sharpen'] !== false)) {
+            if (!empty($options[ 'sharpen' ]) && ($options[ 'sharpen' ] !== false)) {
                 $sharpen = ',unsharp=5:5:1.0:5:5:0.0';
             }
             $ffmpegCmd .= ' -vf "scale='
-                .$options['width'].':'.$options['height']
+                .$options[ 'width' ] . ':' . $options[ 'height' ]
                 .$aspectRatio
                 .$sharpen
                 .'"';
@@ -791,7 +791,7 @@ 
     {
         // Default options
         $settings = Transcoder::$plugin->getSettings();
-        $defaultOptions = $settings[$defaultName];
+        $defaultOptions = $settings[ $defaultName ];
 
         // Coalesce the passed in $options with the $defaultOptions
         $options = array_merge($defaultOptions, $options);

src/models/Settings.php

Spacing +22 added lines, -22 removed lines

@@ -29,11 +29,11 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct(array $config = [])
+    public function __construct(array $config = [ ])
     {
         // Unset any deprecated properties
         if (!empty($config)) {
-            unset($config['transcoderPath'], $config['transcoderUrl']);
+            unset($config[ 'transcoderPath' ], $config[ 'transcoderUrl' ]);
         }
         parent::__construct($config);
     }
@@ -227,7 +227,7 @@ 
     public function init()
     {
         $tokens = [
-            '{DOCUMENT_ROOT}' => $_SERVER['DOCUMENT_ROOT'],
+            '{DOCUMENT_ROOT}' => $_SERVER[ 'DOCUMENT_ROOT' ],
         ];
         $this->transcoderPath = str_replace(array_keys($tokens), array_values($tokens), $this->transcoderPath);
     }
@@ -238,25 +238,25 @@ 
     public function rules()
     {
         return [
-            ['ffmpegPath', 'string'],
-            ['ffmpegPath', 'required'],
-            ['ffprobePath', 'string'],
-            ['ffprobePath', 'required'],
-            ['ffprobeOptions', 'string'],
-            ['ffprobeOptions', 'safe'],
-            ['transcoderPath', 'string'],
-            ['transcoderPath', 'required'],
-            ['transcoderPaths', ArrayValidator::class],
-            ['transcoderPaths', 'required'],
-            ['transcoderUrls', ArrayValidator::class],
-            ['transcoderUrls', 'required'],
-            ['useHashedNames', 'boolean'],
-            ['useHashedNames', 'default', 'value' => false],
-            ['videoEncoders', 'required'],
-            ['audioEncoders', 'required'],
-            ['defaultVideoOptions', 'required'],
-            ['defaultThumbnailOptions', 'required'],
-            ['defaultAudioOptions', 'required'],
+            [ 'ffmpegPath', 'string' ],
+            [ 'ffmpegPath', 'required' ],
+            [ 'ffprobePath', 'string' ],
+            [ 'ffprobePath', 'required' ],
+            [ 'ffprobeOptions', 'string' ],
+            [ 'ffprobeOptions', 'safe' ],
+            [ 'transcoderPath', 'string' ],
+            [ 'transcoderPath', 'required' ],
+            [ 'transcoderPaths', ArrayValidator::class ],
+            [ 'transcoderPaths', 'required' ],
+            [ 'transcoderUrls', ArrayValidator::class ],
+            [ 'transcoderUrls', 'required' ],
+            [ 'useHashedNames', 'boolean' ],
+            [ 'useHashedNames', 'default', 'value' => false ],
+            [ 'videoEncoders', 'required' ],
+            [ 'audioEncoders', 'required' ],
+            [ 'defaultVideoOptions', 'required' ],
+            [ 'defaultThumbnailOptions', 'required' ],
+            [ 'defaultAudioOptions', 'required' ],
         ];
     }
 }