nystudio107 / craft-transcoder

src/variables/TranscoderVariable.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      *
      * @param $filePath
      * @param $videoOptions
-	 * @bool $generate 
+     * @bool $generate 
      *
      * @return string
      */

src/services/Transcode.php

Indentation +22 added lines, -22 removed lines

@@ -95,14 +95,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)) {
@@ -203,7 +203,7 @@ 
                 
             // skip encoding
             } elseif (!$generate) {
-	            $result = "";
+                $result = "";
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
@@ -232,12 +232,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);
 
@@ -324,12 +324,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);
 
@@ -588,12 +588,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 +15 added lines, -15 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;
             }
         }
@@ -327,14 +327,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);
@@ -404,7 +404,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))) {
-                $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
@@ -479,7 +479,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;
             }
@@ -591,7 +591,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;
 		}
 		        
@@ -599,7 +599,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
@@ -653,7 +653,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
@@ -739,14 +739,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 {

src/config.php

Indentation +4 added lines, -4 removed lines

@@ -57,11 +57,11 @@
     // Use a md5 hash for the filenames instead of parameterized naming
     'useHashedNames' => false,
 
-	// if a upload location has a subfolder defined, add this to the transcoder paths too
-	'createSubfolders' => true,
+    // if a upload location has a subfolder defined, add this to the transcoder paths too
+    'createSubfolders' => true,
 	
-	// clear caches when somebody clears all caches from the CP?
-	'clearCaches' => false,
+    // clear caches when somebody clears all caches from the CP?
+    'clearCaches' => false,
 	
     // Preset video encoders
     'videoEncoders' => [

src/Transcoder.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
         $transcoderPaths = Transcoder::$plugin->getSettings()->transcoderPaths;
         $clearCaches = Transcoder::$plugin->getSettings()->clearCaches;
         
-        if($clearCaches) {
+        if ($clearCaches) {
             foreach ($transcoderPaths as $key => $value) {
                 $dir = Craft::getAlias($value);
                 try {
@@ -133,7 +133,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);
@@ -150,7 +150,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_GET_THUMB_PATH,
-            function (AssetThumbEvent $event) {
+            function(AssetThumbEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_GET_THUMB_PATH',
                     __METHOD__
@@ -166,7 +166,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 $event->options[] = [
                     'key' => 'transcoder',
                     'label' => Craft::t('transcoder', 'Transcoder caches'),
@@ -178,7 +178,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     $request = Craft::$app->getRequest();
                     if ($request->isCpRequest) {
@@ -203,7 +203,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__