nystudio107 / craft-transcoder

src/services/Transcode.php

Spacing +68 added lines, -68 removed lines

@@ -111,7 +111,7 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destVideoPath = $settings['transcoderPaths']['video'] . $subfolder ?? $settings['transcoderPaths']['default'];
+            $destVideoPath = $settings['transcoderPaths']['video'].$subfolder ?? $settings['transcoderPaths']['default'];
             $destVideoPath = Craft::parseEnv($destVideoPath);
             $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
 
@@ -123,20 +123,20 @@ 
 
             // Build the basic command for ffmpeg
             $ffmpegCmd = $settings['ffmpegPath']
-                . ' -i ' . escapeshellarg($filePath)
-                . ' -vcodec ' . $thisEncoder['videoCodec']
-                . ' ' . $thisEncoder['videoCodecOptions']
+                . ' -i '.escapeshellarg($filePath)
+                . ' -vcodec '.$thisEncoder['videoCodec']
+                . ' '.$thisEncoder['videoCodecOptions']
                 . ' -bufsize 1000k'
-                . ' -threads ' . $thisEncoder['threads'];
+                . ' -threads '.$thisEncoder['threads'];
 
             // Set the framerate if desired
             if (!empty($videoOptions['videoFrameRate'])) {
-                $ffmpegCmd .= ' -r ' . $videoOptions['videoFrameRate'];
+                $ffmpegCmd .= ' -r '.$videoOptions['videoFrameRate'];
             }
 
             // Set the bitrate if desired
             if (!empty($videoOptions['videoBitRate'])) {
-                $ffmpegCmd .= ' -b:v ' . $videoOptions['videoBitRate'] . ' -maxrate ' . $videoOptions['videoBitRate'];
+                $ffmpegCmd .= ' -b:v '.$videoOptions['videoBitRate'].' -maxrate '.$videoOptions['videoBitRate'];
             }
 
             // Adjust the scaling if desired
@@ -154,17 +154,17 @@ 
                 $ffmpegCmd .= ' -c:a copy';
             } else {
                 // Do audio transcoding based on the settings
-                $ffmpegCmd .= ' -acodec ' . $thisEncoder['audioCodec'];
+                $ffmpegCmd .= ' -acodec '.$thisEncoder['audioCodec'];
                 if (!empty($videoOptions['audioBitRate'])) {
-                    $ffmpegCmd .= ' -b:a ' . $videoOptions['audioBitRate'];
+                    $ffmpegCmd .= ' -b:a '.$videoOptions['audioBitRate'];
                 }
                 if (!empty($videoOptions['audioSampleRate'])) {
-                    $ffmpegCmd .= ' -ar ' . $videoOptions['audioSampleRate'];
+                    $ffmpegCmd .= ' -ar '.$videoOptions['audioSampleRate'];
                 }
                 if (!empty($videoOptions['audioChannels'])) {
-                    $ffmpegCmd .= ' -ac ' . $videoOptions['audioChannels'];
+                    $ffmpegCmd .= ' -ac '.$videoOptions['audioChannels'];
                 }
-                $ffmpegCmd .= ' ' . $thisEncoder['audioCodecOptions'];
+                $ffmpegCmd .= ' '.$thisEncoder['audioCodecOptions'];
             }
 
             // Create the directory if it isn't there already
@@ -179,17 +179,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 $!';
+                . ' -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) {
                 // See if the process is running, and empty result means the process is still running
@@ -205,15 +205,15 @@ 
 
             // 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))) {
-                $url = $settings['transcoderUrls']['video'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::parseEnv($url) . $destVideoFile;
+                $url = $settings['transcoderUrls']['video'].$subfolder ?? $settings['transcoderUrls']['default'];
+                $result = Craft::parseEnv($url).$destVideoFile;
             // skip encoding
             } elseif (!$generate) {
                 $result = "";
             } 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);
@@ -248,14 +248,14 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destThumbnailPath = $settings['transcoderPaths']['thumbnail'] . $subfolder ?? $settings['transcoderPaths']['default'];
+            $destThumbnailPath = $settings['transcoderPaths']['thumbnail'].$subfolder ?? $settings['transcoderPaths']['default'];
             $destThumbnailPath = Craft::parseEnv($destThumbnailPath);
 
             $thumbnailOptions = $this->coalesceOptions('defaultThumbnailOptions', $thumbnailOptions);
 
             // Build the basic command for ffmpeg
             $ffmpegCmd = $settings['ffmpegPath']
-                . ' -i ' . escapeshellarg($filePath)
+                . ' -i '.escapeshellarg($filePath)
                 . ' -vcodec mjpeg'
                 . ' -vframes 1';
 
@@ -268,7 +268,7 @@ 
             // 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';
+                $ffmpegCmd .= ' -ss '.$timeCode.'.00';
             }
 
             // Create the directory if it isn't there already
@@ -284,7 +284,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)) {
@@ -298,7 +298,7 @@ 
 
                     return false;
                 } 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;
@@ -308,8 +308,8 @@ 
             if ($asPath) {
                 $result = $destThumbnailPath;
             } else {
-                $url = $settings['transcoderUrls']['thumbnail'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::parseEnv($url) . $destThumbnailFile;
+                $url = $settings['transcoderUrls']['thumbnail'].$subfolder ?? $settings['transcoderUrls']['default'];
+                $result = Craft::parseEnv($url).$destThumbnailFile;
             }
         }
 
@@ -339,7 +339,7 @@ 
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
-            $destAudioPath = $settings['transcoderPaths']['audio'] . $subfolder ?? $settings['transcoderPaths']['default'];
+            $destAudioPath = $settings['transcoderPaths']['audio'].$subfolder ?? $settings['transcoderPaths']['default'];
             $destAudioPath = Craft::parseEnv($destAudioPath);
 
             $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
@@ -352,33 +352,33 @@ 
 
             // Build the basic command for ffmpeg
             $ffmpegCmd = $settings['ffmpegPath']
-                . ' -i ' . escapeshellarg($filePath)
-                . ' -acodec ' . $thisEncoder['audioCodec']
-                . ' ' . $thisEncoder['audioCodecOptions']
+                . ' -i '.escapeshellarg($filePath)
+                . ' -acodec '.$thisEncoder['audioCodec']
+                . ' '.$thisEncoder['audioCodecOptions']
                 . ' -bufsize 1000k'
                 . ' -vn'
-                . ' -threads ' . $thisEncoder['threads'];
+                . ' -threads '.$thisEncoder['threads'];
 
             // Set the bitrate if desired
             if (!empty($audioOptions['audioBitRate'])) {
-                $ffmpegCmd .= ' -b:a ' . $audioOptions['audioBitRate'];
+                $ffmpegCmd .= ' -b:a '.$audioOptions['audioBitRate'];
             }
             // Set the sample rate if desired
             if (!empty($audioOptions['audioSampleRate'])) {
-                $ffmpegCmd .= ' -ar ' . $audioOptions['audioSampleRate'];
+                $ffmpegCmd .= ' -ar '.$audioOptions['audioSampleRate'];
             }
             // Set the audio channels if desired
             if (!empty($audioOptions['audioChannels'])) {
-                $ffmpegCmd .= ' -ac ' . $audioOptions['audioChannels'];
+                $ffmpegCmd .= ' -ac '.$audioOptions['audioChannels'];
             }
-            $ffmpegCmd .= ' ' . $thisEncoder['audioCodecOptions'];
+            $ffmpegCmd .= ' '.$thisEncoder['audioCodecOptions'];
 
             if (!empty($audioOptions['seekInSecs'])) {
-                $ffmpegCmd .= ' -ss ' . $audioOptions['seekInSecs'];
+                $ffmpegCmd .= ' -ss '.$audioOptions['seekInSecs'];
             }
 
             if (!empty($audioOptions['timeInSecs'])) {
-                $ffmpegCmd .= ' -t ' . $audioOptions['timeInSecs'];
+                $ffmpegCmd .= ' -t '.$audioOptions['timeInSecs'];
             }
 
             // Create the directory if it isn't there already
@@ -393,7 +393,7 @@ 
             $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;
@@ -408,16 +408,16 @@ 
             // Add the file format
             $ffmpegCmd .= ' -f '
                 . $thisEncoder['fileFormat']
-                . ' -y ' . escapeshellarg($destAudioPath);
+                . ' -y '.escapeshellarg($destAudioPath);
             // Handle the `synchronous` setting
             $synchronous = false;
             if (!empty($audioOptions['synchronous'])) {
                 $synchronous = $audioOptions['synchronous'];
             }
             if (!$synchronous) {
-                $ffmpegCmd .= ' 1> ' . $progressFile . ' 2>&1 & echo $!';
+                $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';
+                $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock';
                 $oldPid = @file_get_contents($lockFile);
                 if ($oldPid !== false) {
                     // See if the process is running, and empty result means the process is still running
@@ -434,18 +434,18 @@ 
 
             // 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))) {
-                $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::parseEnv($url) . $destAudioFile;
+                $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default'];
+                $result = Craft::parseEnv($url).$destAudioFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
 
                 if ($synchronous) {
                     Craft::info($ffmpegCmd, __METHOD__);
-                    $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                    $result = Craft::parseEnv($url) . $destAudioFile;
+                    $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default'];
+                    $result = Craft::parseEnv($url).$destAudioFile;
                 } else {
-                    Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
+                    Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
                     // Create a lockfile in tmp
                     file_put_contents($lockFile, $pid);
                 }
@@ -473,8 +473,8 @@ 
             // Build the basic command for ffprobe
             $ffprobeOptions = $settings['ffprobeOptions'];
             $ffprobeCmd = $settings['ffprobePath']
-                . ' ' . $ffprobeOptions
-                . ' ' . escapeshellarg($filePath);
+                . ' '.$ffprobeOptions
+                . ' '.escapeshellarg($filePath);
 
             $shellOutput = $this->executeShellCommand($ffprobeCmd);
             Craft::info($ffprobeCmd, __METHOD__);
@@ -520,7 +520,7 @@ 
                     && (strpos($summaryResult['videoFrameRate'], '/') !== false)
                 ) {
                     $parts = explode('/', $summaryResult['videoFrameRate']);
-                    $summaryResult['videoFrameRate'] = (float)$parts[0] / (float)$parts[1];
+                    $summaryResult['videoFrameRate'] = (float) $parts[0] / (float) $parts[1];
                 }
                 $result = $summaryResult;
             }
@@ -640,7 +640,7 @@ 
 
         if (!empty($filePath)) {
             // Dest path
-            $destVideoPath = $settings['transcoderPaths']['gif'] . $subfolder ?? $settings['transcoderPaths']['default'];
+            $destVideoPath = $settings['transcoderPaths']['gif'].$subfolder ?? $settings['transcoderPaths']['default'];
             $destVideoPath = Craft::parseEnv($destVideoPath);
 
             // Options
@@ -654,9 +654,9 @@ 
             // Build the basic command for ffmpeg
             $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
@@ -671,16 +671,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) {
                 // See if the process is running, and empty result means the process is still running
@@ -696,12 +696,12 @@ 
 
             // 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))) {
-                $url = $settings['transcoderUrls']['gif'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::parseEnv($url) . $destVideoFile;
+                $url = $settings['transcoderUrls']['gif'].$subfolder ?? $settings['transcoderUrls']['default'];
+                $result = Craft::parseEnv($url).$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);
@@ -742,16 +742,16 @@ 
                     $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);
+            $fileName = $pathParts['filename'].md5($fileName);
         }
         $fileName .= $options['fileSuffix'];
 
@@ -791,7 +791,7 @@ 
                     }
                     $folderPath .= '' === $folderPath ? '' : DIRECTORY_SEPARATOR;
 
-                    $filePath = $sourcePath . $folderPath . $asset->filename;
+                    $filePath = $sourcePath.$folderPath.$asset->filename;
                 } else {
                     // Otherwise, get a URL
                     $filePath = $asset->getUrl();
@@ -833,16 +833,16 @@ 
                     case 'letterbox':
                         $letterboxColor = '';
                         if (!empty($options['letterboxColor'])) {
-                            $letterboxColor = ':color=' . $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:
@@ -856,7 +856,7 @@ 
                 $sharpen = ',unsharp=5:5:1.0:5:5:0.0';
             }
             $ffmpegCmd .= ' -vf "scale='
-                . $options['width'] . ':' . $options['height']
+                . $options['width'].':'.$options['height']
                 . $aspectRatio
                 . $sharpen
                 . '"';