nystudio107 / craft-transcoder

src/services/Transcode.php

Spacing +16 added lines, -16 removed lines

@@ -98,7 +98,7 @@ 
 		$subfolder = '';
 		
 		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+		if (\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
 			$subfolder = $filePath->folderPath;
 		}
 
@@ -106,7 +106,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::getAlias($destVideoPath);           
             $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
 
@@ -198,7 +198,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))) {
-                $url = $settings['transcoderUrls']['video'] . $subfolder ?? $settings['transcoderUrls']['default'];
+                $url = $settings['transcoderUrls']['video'].$subfolder ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destVideoFile;
                 
             // skip encoding
@@ -235,14 +235,14 @@ 
 		$subfolder = '';
 		
 		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+		if (\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
 			$subfolder = $filePath->folderPath;
 		}
 		        
         $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::getAlias($destThumbnailPath);
 
             $thumbnailOptions = $this->coalesceOptions('defaultThumbnailOptions', $thumbnailOptions);
@@ -303,7 +303,7 @@ 
             if ($asPath) {
                 $result = $destThumbnailPath;
             } else {
-                $url = $settings['transcoderUrls']['thumbnail'] . $subfolder ?? $settings['transcoderUrls']['default'];
+                $url = $settings['transcoderUrls']['thumbnail'].$subfolder ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destThumbnailFile;
             }
         }
@@ -328,14 +328,14 @@ 
 		$subfolder = '';
 		
 		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+		if (\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
 			$subfolder = $filePath->folderPath;
 		}
 		
         $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::getAlias($destAudioPath);
 
             $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
@@ -409,13 +409,13 @@ 
 
             // 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'];
+                $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destAudioFile;
             } else {
                 // Kick off the transcoding
                 Craft::info($ffmpegCmd, __METHOD__);
                 $this->executeShellCommand($ffmpegCmd);
-                $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
+                $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destAudioFile;
                 Craft::info($result, __METHOD__);
 
@@ -489,7 +489,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;
             }
@@ -601,7 +601,7 @@ 
 		$subfolder = '';
 		
 		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+		if (\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
 			$subfolder = $filePath->folderPath;
 		}
 		        
@@ -609,7 +609,7 @@ 
 
         if (!empty($filePath)) {
             // Dest path
-            $destVideoPath = $settings['transcoderPaths']['gif'] . $subfolder ?? $settings['transcoderPaths']['default'];
+            $destVideoPath = $settings['transcoderPaths']['gif'].$subfolder ?? $settings['transcoderPaths']['default'];
             $destVideoPath = Craft::getAlias($destVideoPath);
 
             // Options
@@ -663,7 +663,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))) {
-                $url = $settings['transcoderUrls']['gif'] . $subfolder ?? $settings['transcoderUrls']['default'];
+                $url = $settings['transcoderUrls']['gif'].$subfolder ?? $settings['transcoderUrls']['default'];
                 $result = Craft::getAlias($url).$destVideoFile;
             } else {
                 // Kick off the transcoding
@@ -749,14 +749,14 @@ 
                 // 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;
                 } else {