nystudio107 / craft-transcoder

src/services/Transcode.php

Indentation +22 added lines, -22 removed lines

@@ -97,14 +97,14 @@ 
 
         $result = '';
         $settings = Transcoder::$plugin->getSettings();
-		$subfolder = '';
+        $subfolder = '';
 
-		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
-			$subfolder = $filePath->folderPath;
-		}
+        // sub folder check
+        if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+            $subfolder = $filePath->folderPath;
+        }
 
-		// file path
+        // file path
         $filePath = $this->getAssetPath($filePath);
 
         if (!empty($filePath)) {
@@ -204,7 +204,7 @@ 
 
             // skip encoding
             } elseif (!$generate) {
-	            $result = "";
+                $result = "";
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
@@ -238,12 +238,12 @@ 
     {
         $result = null;
         $settings = Transcoder::$plugin->getSettings();
-		$subfolder = '';
+        $subfolder = '';
 
-		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
-			$subfolder = $filePath->folderPath;
-		}
+        // sub folder check
+        if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+            $subfolder = $filePath->folderPath;
+        }
 
         $filePath = $this->getAssetPath($filePath);
 
@@ -334,12 +334,12 @@ 
     {
         $result = '';
         $settings = Transcoder::$plugin->getSettings();
-		$subfolder = '';
+        $subfolder = '';
 
-		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
-			$subfolder = $filePath->folderPath;
-		}
+        // sub folder check
+        if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+            $subfolder = $filePath->folderPath;
+        }
 
         $filePath = $this->getAssetPath($filePath);
 
@@ -603,12 +603,12 @@ 
     {
         $result = '';
         $settings = Transcoder::$plugin->getSettings();
-		$subfolder = '';
+        $subfolder = '';
 
-		// sub folder check
-		if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
-			$subfolder = $filePath->folderPath;
-		}
+        // sub folder check
+        if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) {
+            $subfolder = $filePath->folderPath;
+        }
 
         $filePath = $this->getAssetPath($filePath);
 

Spacing +10 added lines, -10 removed lines

@@ -100,7 +100,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;
 		}
 
@@ -241,7 +241,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;
 		}
 
@@ -313,7 +313,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;
             }
         }
@@ -337,7 +337,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;
 		}
 
@@ -413,7 +413,7 @@ 
 
             // If the audio file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if ($this->shouldGenerateAsset('audio', $destAudioPath, $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
@@ -494,7 +494,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;
             }
@@ -606,7 +606,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;
 		}
 
@@ -667,7 +667,7 @@ 
 
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if ($this->shouldGenerateAsset('gif', $destVideoPath, $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
@@ -757,14 +757,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 {