nystudio107 / craft-transcoder

src/Transcoder.php

Spacing +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('transcoder', TranscoderVariable::class);
@@ -72,7 +72,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_GET_THUMB_PATH,
-            function (AssetThumbEvent $event) {
+            function(AssetThumbEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_GET_THUMB_PATH',
                     __METHOD__
@@ -94,11 +94,11 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
-                $event->options[] = [
+            function(RegisterCacheOptionsEvent $event) {
+                $event->options[ ] = [
                     'key' => 'transcoder',
                     'label' => Craft::t('transcoder', 'Transcoder caches'),
-                    'action' => Transcoder::$plugin->getSettings()->transcoderPaths['default'],
+                    'action' => Transcoder::$plugin->getSettings()->transcoderPaths[ 'default' ],
                 ];
             }
         );
@@ -107,7 +107,7 @@ 
             Craft::t(
                 'transcoder',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );

src/config.php

Indentation +27 added lines, -27 removed lines

@@ -32,27 +32,27 @@ 
     'ffprobePath' => '/usr/bin/ffprobe',
 
     // The options to use for ffprobe
-	'ffprobeOptions' => '-v quiet -print_format json -show_format -show_streams',
+    'ffprobeOptions' => '-v quiet -print_format json -show_format -show_streams',
 
     // The path where the transcoded videos are stored; must have a trailing /
     // Yii2 aliases are supported here    
-	'transcoderPaths' => [
-		'default' 	=> '@webroot/transcoder/',
-		'video' 	=> '@webroot/transcoder/video/',
-		'audio' 	=> '@webroot/transcoder/audio/',
-		'thumbnail' => '@webroot/transcoder/thumbnail/',
-		'gif'		=> '@webroot/transcoder/gif/'
-	],
+    'transcoderPaths' => [
+        'default' 	=> '@webroot/transcoder/',
+        'video' 	=> '@webroot/transcoder/video/',
+        'audio' 	=> '@webroot/transcoder/audio/',
+        'thumbnail' => '@webroot/transcoder/thumbnail/',
+        'gif'		=> '@webroot/transcoder/gif/'
+    ],
 	
     // The URL where the transcoded videos are stored; must have a trailing /
     // Yii2 aliases are supported here
-	'transcoderUrls' => [
-		'default' 	=> '@web/transcoder/',
-		'video' 	=> '@web/transcoder/video/',
-		'audio' 	=> '@web/transcoder/audio/',
-		'thumbnail' => '@web/transcoder/thumbnail/',
-		'gif'		=> '@web/transcoder/gif/'
-	],
+    'transcoderUrls' => [
+        'default' 	=> '@web/transcoder/',
+        'video' 	=> '@web/transcoder/video/',
+        'audio' 	=> '@web/transcoder/audio/',
+        'thumbnail' => '@web/transcoder/thumbnail/',
+        'gif'		=> '@web/transcoder/gif/'
+    ],
 	
     // Use a md5 hash for the filenames instead of parameterized naming
     'useHashedNames' => false,
@@ -76,10 +76,10 @@ 
             'audioCodecOptions' => '-async 1000',
         ],
         'gif' => [
-	        'fileSuffix' => '.mp4',
-	        'fileFormat' => 'mp4',
-	        'videoCodec' => 'libx264',
-	        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+            'fileSuffix' => '.mp4',
+            'fileFormat' => 'mp4',
+            'videoCodec' => 'libx264',
+            'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
         ]        
     ],
 
@@ -145,12 +145,12 @@ 
         'audioChannels' => '2',
     ],
 
-	// Default options for Gif encoding
-	'defaultGifOptions' => [
-		'videoEncoder'    	=> 'gif',
-		'fileSuffix'        => '.mp4',
-		'fileFormat'        => 'gif',
-		'videoCodec'        => 'libx264',
-		'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
-	],
+    // Default options for Gif encoding
+    'defaultGifOptions' => [
+        'videoEncoder'    	=> 'gif',
+        'fileSuffix'        => '.mp4',
+        'fileFormat'        => 'gif',
+        'videoCodec'        => 'libx264',
+        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+    ],
 ];

src/services/Transcode.php

Indentation +5 added lines, -5 removed lines

@@ -186,7 +186,7 @@ 
             } else {
 
                 // Kick off the transcoding
-				$pid = $this->executeShellCommand($ffmpegCmd);
+                $pid = $this->executeShellCommand($ffmpegCmd);
                 Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp
@@ -755,7 +755,7 @@ 
 
         if (!empty($filePath)) {
 
-			// Dest path
+            // Dest path
             $destVideoPath = Craft::getAlias($settings['transcoderPaths']['gif']);
                         
             // Options
@@ -768,13 +768,13 @@ 
 
             // Build the basic command for ffmpeg
             $ffmpegCmd = $settings['ffmpegPath']
-            	. ' -f gif' 
+                . ' -f gif' 
                 . ' -i ' . escapeshellarg($filePath)
                 . ' -vcodec ' . $thisEncoder['videoCodec']
                 . ' ' . $thisEncoder['videoCodecOptions'];
 
 
-             // Create the directory if it isn't there already
+                // Create the directory if it isn't there already
             if (!file_exists($destVideoPath)) {
                 mkdir($destVideoPath);
             }
@@ -809,7 +809,7 @@ 
             } else {
 
                 // Kick off the transcoding
-				$pid = $this->executeShellCommand($ffmpegCmd);
+                $pid = $this->executeShellCommand($ffmpegCmd);
                 Craft::info($ffmpegCmd . "\nffmpeg PID: " . $pid, __METHOD__);
 
                 // Create a lockfile in tmp

Spacing +94 added lines, -94 removed lines

@@ -95,31 +95,31 @@ 
 
         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']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
                 . ' -i ' . escapeshellarg($filePath)
-                . ' -vcodec ' . $thisEncoder['videoCodec']
-                . ' ' . $thisEncoder['videoCodecOptions']
+                . ' -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
@@ -129,25 +129,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,7 +163,7 @@ 
             // Assemble the destination path and final ffmpeg command
             $destVideoPath = $destVideoPath . $destVideoFile;
             $ffmpegCmd .= ' -f '
-                . $thisEncoder['fileFormat']
+                . $thisEncoder[ 'fileFormat' ]
                 . ' -y ' . escapeshellarg($destVideoPath)
                 . ' 1> ' . $progressFile . ' 2>&1 & echo $!';
 
@@ -182,7 +182,7 @@ 
 
             // 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
@@ -216,12 +216,12 @@ 
         $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']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
                 . ' -i ' . escapeshellarg($filePath)
                 . ' -vcodec mjpeg'
                 . ' -vframes 1';
@@ -233,8 +233,8 @@ 
             );
 
             // Set the timecode to get the thumbnail from if desired
-            if (!empty($thumbnailOptions['timeInSecs'])) {
-                $timeCode = gmdate("H:i:s", $thumbnailOptions['timeInSecs']);
+            if (!empty($thumbnailOptions[ 'timeInSecs' ])) {
+                $timeCode = gmdate("H:i:s", $thumbnailOptions[ 'timeInSecs' ]);
                 $ffmpegCmd .= ' -ss ' . $timeCode . '.00';
             }
 
@@ -264,7 +264,7 @@ 
             if ($asPath) {
                 $result = $destThumbnailPath;
             } else {
-                $result = Craft::getAlias($settings['transcoderUrls']['thumbnail']) . $destThumbnailFile;
+                $result = Craft::getAlias($settings[ 'transcoderUrls' ][ 'thumbnail' ]) . $destThumbnailFile;
             }
         }
 
@@ -288,37 +288,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']
+            $ffmpegCmd = $settings[ 'ffmpegPath' ]
                 . ' -i ' . escapeshellarg($filePath)
-                . ' -acodec ' . $thisEncoder['audioCodec']
-                . ' ' . $thisEncoder['audioCodecOptions']
+                . ' -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
@@ -334,7 +334,7 @@ 
             // Assemble the destination path and final ffmpeg command
             $destAudioPath = $destAudioPath . $destAudioFile;
             $ffmpegCmd .= ' -f '
-                . $thisEncoder['fileFormat']
+                . $thisEncoder[ 'fileFormat' ]
                 . ' -y ' . escapeshellarg($destAudioPath)
                 . ' 1> ' . $progressFile . ' 2>&1 & echo $!';
 
@@ -353,7 +353,7 @@ 
 
             // 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);
@@ -384,8 +384,8 @@ 
 
         if (!empty($filePath)) {
             // Build the basic command for ffprobe
-            $ffprobeOptions = $settings['ffprobeOptions'];
-            $ffprobeCmd = $settings['ffprobePath']
+            $ffprobeOptions = $settings[ 'ffprobeOptions' ];
+            $ffprobeCmd = $settings[ 'ffprobePath' ]
                 . ' ' . $ffprobeOptions
                 . ' ' . escapeshellarg($filePath);
 
@@ -396,24 +396,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 ($this->infoSummary['format'] as $settingKey => $settingValue) {
-                                if (!empty($topLevelValue[$settingKey])) {
-                                    $summaryResult[$settingValue] = $topLevelValue[$settingKey];
+                            foreach ($this->infoSummary[ '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 ($this->infoSummary[$infoSummaryType] as $settingKey => $settingValue) {
-                                    if (!empty($stream[$settingKey])) {
-                                        $summaryResult[$settingValue] = $stream[$settingKey];
+                                $infoSummaryType = $stream[ 'codec_type' ];
+                                foreach ($this->infoSummary[ $infoSummaryType ] as $settingKey => $settingValue) {
+                                    if (!empty($stream[ $settingKey ])) {
+                                        $summaryResult[ $settingValue ] = $stream[ $settingKey ];
                                     }
                                 }
                             }
@@ -424,11 +424,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'] = floatval($parts[0]) / floatval($parts[1]);
+                    $parts = explode('/', $summaryResult[ 'videoFrameRate' ]);
+                    $summaryResult[ 'videoFrameRate' ] = floatval($parts[ 0 ]) / floatval($parts[ 1 ]);
                 }
                 $result = $summaryResult;
             }
@@ -451,10 +451,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' ];
 
         $result = $this->getFilename($filePath, $videoOptions);
 
@@ -475,10 +475,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' ];
 
         $result = $this->getFilename($filePath, $audioOptions);
 
@@ -499,10 +499,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' ];
 
         $result = $this->getFilename($filePath, $gifOptions);
 
@@ -547,18 +547,18 @@ 
         $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($this->suffixMap[$key])) {
-                    $suffix = $this->suffixMap[$key];
+                if (!empty($this->suffixMap[ $key ])) {
+                    $suffix = $this->suffixMap[ $key ];
                 }
                 if (is_bool($value)) {
                     $value = $value ? $key : 'no' . $key;
@@ -569,10 +569,10 @@ 
             }
         }
         // 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;
     }
@@ -643,39 +643,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
                 . '"';
@@ -696,7 +696,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);
@@ -756,22 +756,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'];
+                . ' -vcodec ' . $thisEncoder[ 'videoCodec' ]
+                . ' ' . $thisEncoder[ 'videoCodecOptions' ];
 
 
              // Create the directory if it isn't there already
@@ -805,7 +805,7 @@ 
 
             // 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

src/models/Settings.php

Indentation +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @var string
      */
-	 public $transcoderPaths = [];
+        public $transcoderPaths = [];
 	 
     /**
      * The URL where the transcoded videos are stored; must have a trailing /
@@ -91,10 +91,10 @@ 
             'audioCodecOptions' => '-async 1000',
         ],
         'gif' => [
-	        'fileSuffix' => '.mp4',
-	        'fileFormat' => 'mp4',
-	        'videoCodec' => 'libx264',
-	        'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+            'fileSuffix' => '.mp4',
+            'fileFormat' => 'mp4',
+            'videoCodec' => 'libx264',
+            'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
         ]           
     ];
 
@@ -182,7 +182,7 @@ 
      * @var array
      */
     public $defaultGifOptions = [
-		'videoEncoder'    	=> 'gif',
+        'videoEncoder'    	=> 'gif',
         'fileSuffix'        => '',
         'fileFormat'        => '',
         'videoCodec'        => '',

Spacing +22 added lines, -22 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @var string
      */
-	 public $transcoderPaths = [];
+	 public $transcoderPaths = [ ];
 	 
     /**
      * The URL where the transcoded videos are stored; must have a trailing /
@@ -59,7 +59,7 @@ 
      *
      * @var string
      */
-    public $transcoderUrls = [];
+    public $transcoderUrls = [ ];
 
     /**
      * Use a md5 hash for the filenames instead of parameterized naming
@@ -198,7 +198,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);
     }
@@ -209,25 +209,25 @@ 
     public function rules()
     {
         return [
-            ['ffmpegPath', 'string'],
-            ['ffmpegPath', 'required'],
-            ['ffprobePath', 'string'],
-            ['ffprobePath', 'required'],
-            ['ffprobeOptions', 'string'],
-            ['ffprobeOptions', 'safe'],
-            ['transcoderPath', 'string'],
-            ['transcoderPath', 'required'],
-            ['transcoderPaths', 'array'],
-            ['transcoderPaths', 'required'],
-            ['transcoderUrls', 'array'],
-            ['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', 'array' ],
+            [ 'transcoderPaths', 'required' ],
+            [ 'transcoderUrls', 'array' ],
+            [ 'transcoderUrls', 'required' ],
+            [ 'useHashedNames', 'boolean' ],
+            [ 'useHashedNames', 'default', 'value' => false ],
+            [ 'videoEncoders', 'required' ],
+            [ 'audioEncoders', 'required' ],
+            [ 'defaultVideoOptions', 'required' ],
+            [ 'defaultThumbnailOptions', 'required' ],
+            [ 'defaultAudioOptions', 'required' ],
         ];
     }
 }

src/controllers/DefaultController.php

Indentation +31 added lines, -31 removed lines

@@ -85,20 +85,20 @@ 
             
                 if(count($matches) > 0) {
 	        
-	                $rawDuration = $matches[1];
+                    $rawDuration = $matches[1];
 	        	
-	                // rawDuration is in 00:00:00.00 format. This converts it to seconds.
-	                $ar = array_reverse(explode(":", $rawDuration));
-	                $duration = floatval($ar[0]);
-	                if (!empty($ar[1])) {
-	                    $duration += intval($ar[1]) * 60;
-	                }
-	                if (!empty($ar[2])) {
-	                    $duration += intval($ar[2]) * 60 * 60;
-	                }             	                
-				} else {
-					$duration = 'unknown'; // with GIF as input, duration is unknown
-				}
+                    // rawDuration is in 00:00:00.00 format. This converts it to seconds.
+                    $ar = array_reverse(explode(":", $rawDuration));
+                    $duration = floatval($ar[0]);
+                    if (!empty($ar[1])) {
+                        $duration += intval($ar[1]) * 60;
+                    }
+                    if (!empty($ar[2])) {
+                        $duration += intval($ar[2]) * 60 * 60;
+                    }             	                
+                } else {
+                    $duration = 'unknown'; // with GIF as input, duration is unknown
+                }
 
                 // Get the time in the file that is already encoded
                 preg_match_all("/time=(.*?) bitrate/", $content, $matches);
@@ -121,28 +121,28 @@ 
 
                 //calculate the progress
                 if($duration != 'unknown') {
-	                $progress = round(($time / $duration) * 100);
+                    $progress = round(($time / $duration) * 100);
                 } else {
-	                $progress = 'unknown';
+                    $progress = 'unknown';
                 }
                 		
-				// return results
+                // return results
                 if($progress != "unknown" && $progress < 100) {
-		            $result = [
-	                    'filename' => $filename,
-	                    'duration' => $duration,
-	                    'time'     => $time,
-	                    'progress' => $progress,
-	                ];
-	            } elseif($progress == "unknown") {
-		            $result = [
-	                    'filename' => $filename,
-	                    'duration' => 'unknown',
-	                    'time'     => $time,
-	                    'progress' => 'unknown',
-	                    'message' => 'encoding GIF, can\'t determine duration'
-	                ];            
-	            }
+                    $result = [
+                        'filename' => $filename,
+                        'duration' => $duration,
+                        'time'     => $time,
+                        'progress' => $progress,
+                    ];
+                } elseif($progress == "unknown") {
+                    $result = [
+                        'filename' => $filename,
+                        'duration' => 'unknown',
+                        'time'     => $time,
+                        'progress' => 'unknown',
+                        'message' => 'encoding GIF, can\'t determine duration'
+                    ];            
+                }
             }
         }
 

Spacing +18 added lines, -18 removed lines

@@ -51,11 +51,11 @@ 
     public function actionDownloadFile($url)
     {
         $filePath = parse_url($url, PHP_URL_PATH);
-        $filePath = $_SERVER['DOCUMENT_ROOT'] . $filePath;
+        $filePath = $_SERVER[ 'DOCUMENT_ROOT' ] . $filePath;
         Craft::$app->getResponse()->sendFile(
             $filePath,
             null,
-            ['inline' => false]
+            [ 'inline' => false ]
         );
         Craft::$app->end();
     }
@@ -74,7 +74,7 @@ 
      */
     public function actionProgress($filename)
     {
-        $result = [];
+        $result = [ ];
         $progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $filename . ".progress";
         if (file_exists($progressFile)) {
             $content = @file_get_contents($progressFile);
@@ -83,18 +83,18 @@ 
                 // get duration of source
                 preg_match("/Duration: (.*?), start:/", $content, $matches);
             
-                if(count($matches) > 0) {
+                if (count($matches) > 0) {
 	        
-	                $rawDuration = $matches[1];
+	                $rawDuration = $matches[ 1 ];
 	        	
 	                // rawDuration is in 00:00:00.00 format. This converts it to seconds.
 	                $ar = array_reverse(explode(":", $rawDuration));
-	                $duration = floatval($ar[0]);
-	                if (!empty($ar[1])) {
-	                    $duration += intval($ar[1]) * 60;
+	                $duration = floatval($ar[ 0 ]);
+	                if (!empty($ar[ 1 ])) {
+	                    $duration += intval($ar[ 1 ]) * 60;
 	                }
-	                if (!empty($ar[2])) {
-	                    $duration += intval($ar[2]) * 60 * 60;
+	                if (!empty($ar[ 2 ])) {
+	                    $duration += intval($ar[ 2 ]) * 60 * 60;
 	                }             	                
 				} else {
 					$duration = 'unknown'; // with GIF as input, duration is unknown
@@ -111,30 +111,30 @@ 
 
                 //rawTime is in 00:00:00.00 format. This converts it to seconds.
                 $ar = array_reverse(explode(":", $rawTime));
-                $time = floatval($ar[0]);
-                if (!empty($ar[1])) {
-                    $time += intval($ar[1]) * 60;
+                $time = floatval($ar[ 0 ]);
+                if (!empty($ar[ 1 ])) {
+                    $time += intval($ar[ 1 ]) * 60;
                 }
-                if (!empty($ar[2])) {
-                    $time += intval($ar[2]) * 60 * 60;
+                if (!empty($ar[ 2 ])) {
+                    $time += intval($ar[ 2 ]) * 60 * 60;
                 }
 
                 //calculate the progress
-                if($duration != 'unknown') {
+                if ($duration != 'unknown') {
 	                $progress = round(($time / $duration) * 100);
                 } else {
 	                $progress = 'unknown';
                 }
                 		
 				// return results
-                if($progress != "unknown" && $progress < 100) {
+                if ($progress != "unknown" && $progress < 100) {
 		            $result = [
 	                    'filename' => $filename,
 	                    'duration' => $duration,
 	                    'time'     => $time,
 	                    'progress' => $progress,
 	                ];
-	            } elseif($progress == "unknown") {
+	            } elseif ($progress == "unknown") {
 		            $result = [
 	                    'filename' => $filename,
 	                    'duration' => 'unknown',