sportarchive / CloudTranscode

src/activities/TranscodeAssetActivity.php

Braces +28 added lines, -19 removed lines

@@ -85,8 +85,9 @@ 
             // Upload resulting file
             $this->uploadResultFiles($task, $output);
 
-            if ($this->client)
-                $this->client->onTranscodeDone($this->token, $result);
+            if ($this->client) {
+                            $this->client->onTranscodeDone($this->token, $result);
+            }
         }
 
         return json_encode($result);
@@ -102,8 +103,9 @@ 
         
         # If we have metadata, we expect the output of ffprobe
         $metadata = null;
-        if (isset($this->input->{'input_metadata'}))
-            $metadata = $this->input->{'input_metadata'};
+        if (isset($this->input->{'input_metadata'})) {
+                    $metadata = $this->input->{'input_metadata'};
+        }
         
         // Perform transcoding
         $result = $imageTranscoder->transcode_asset(
@@ -140,8 +142,9 @@ 
 
         # If we have metadata, we expect the output of ffprobe
         $metadata = null;
-        if (isset($this->input->{'input_metadata'}))
-            $metadata = $this->input->{'input_metadata'};
+        if (isset($this->input->{'input_metadata'})) {
+                    $metadata = $this->input->{'input_metadata'};
+        }
 
         // Perform transcoding
         $result = $videoTranscoder->transcode_asset(
@@ -224,16 +227,18 @@ 
 
         if (!file_exists($outputFilesPath))
         {
-            if ($this->debug)
-                $this->cpeLogger->logOut("INFO", basename(__FILE__),
+            if ($this->debug) {
+                            $this->cpeLogger->logOut("INFO", basename(__FILE__),
                                          "Creating TMP output folder '".$outputFilesPath."'",
                                          $this->logKey);
+            }
 
-            if (!mkdir($outputFilesPath, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($outputFilesPath, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$outputFilesPath' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
 
         return ($outputFilesPath);
@@ -302,15 +307,18 @@ 
     global $name;
 
     // Handle input parameters
-    if (!($options = getopt("N:A:l:C:hd")))
-        usage();
+    if (!($options = getopt("N:A:l:C:hd"))) {
+            usage();
+    }
 
-    if (isset($options['h']))
-        usage();
+    if (isset($options['h'])) {
+            usage();
+    }
 
     // Debug
-    if (isset($options['d']))
-        $debug = true;
+    if (isset($options['d'])) {
+            $debug = true;
+    }
 
     if (isset($options['A']) && $options['A']) {
         $arn = $options['A'];
@@ -329,9 +337,10 @@ 
         $name = $options['N'];
     }
 
-    if (isset($options['l']))
-        $logPath = $options['l'];
-}
+    if (isset($options['l'])) {
+            $logPath = $options['l'];
+    }
+    }
 
 
 

src/activities/transcoders/VideoTranscoder.php

Braces +7 added lines, -10 removed lines

@@ -80,13 +80,14 @@ 
             $this->logKey
         );
 
-        if ($metadata)
-            $this->cpeLogger->logOut(
+        if ($metadata) {
+                    $this->cpeLogger->logOut(
                 "INFO",
                 basename(__FILE__),
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->logKey
             );
+        }
 
         try {
             $ffmpegCmd = "";
@@ -165,8 +166,7 @@ 
 
             // FFProbe the output file and return its information
             $outputInfo = $this->getAssetInfo($outputFilesPath."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR",
                 basename(__FILE__),
@@ -319,8 +319,7 @@ 
             $time = gmdate("H:i:s", $snapshot_sec) . ".000";
             $outputFilesPath .= "/" . $outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
-        }
-        else if ($outputWanted->{'mode'} == 'intervals')
+        } else if ($outputWanted->{'mode'} == 'intervals')
         {
             $intervals = self::INTERVALS_DEFAULT;
             if (isset($outputWanted->{'intervals'}) &&
@@ -373,8 +372,7 @@ 
                                             array(1 => array("pipe", "w"), 2 => array("pipe", "w")),
                                             false, false,
                                             false, 1);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR",
                 basename(__FILE__),
@@ -626,8 +624,7 @@ 
         foreach ($metadata->streams as $key => $value) {
             if ($value->codec_type === 'video') {
                 $videoStreams = $value;
-            }
-            else if ($value->codec_type === 'audio') {
+            } else if ($value->codec_type === 'audio') {
                 $audioStreams = $value;
             }
         }

src/activities/transcoders/BasicTranscoder.php

Braces +4 added lines, -3 removed lines

@@ -59,7 +59,9 @@ 
 
     public function isDirEmpty($dir)
     {
-        if (!is_readable($dir)) return null; 
+        if (!is_readable($dir)) {
+            return null;
+        }
         $handle = opendir($dir);
         while (false !== ($entry = readdir($handle))) {
             if ($entry !== '.' && $entry !== '..') { 
@@ -94,8 +96,7 @@ 
                 false, false, 
                 false, 1
             );
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR", 
                 basename(__FILE__), 

src/activities/transcoders/ImageTranscoder.php

Braces +5 added lines, -6 removed lines

@@ -54,13 +54,14 @@ 
             $this->activityLogKey
         );
 
-        if ($metadata)
-            $this->cpeLogger->logOut(
+        if ($metadata) {
+                    $this->cpeLogger->logOut(
                 "INFO", 
                 basename(__FILE__), 
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->activityLogKey
             );
+        }
 
         try {
             $convertCmd = "";
@@ -81,8 +82,7 @@ 
                     $metadata, 
                     $outputWanted
                 );
-            }
-            else {
+            } else {
                 $convertCmd = $this->craft_convert_cmd(
                     $tmpPathInput,
                     $pathToInputFile,
@@ -127,8 +127,7 @@ 
             // XXX: Remove FFprobe for image convertion. Save time
             $outputInfo =
                 $this->getAssetInfo($pathToOutputFiles."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR", 
                 basename(__FILE__), 

src/activities/ValidateAssetActivity.php

Braces +20 added lines, -15 removed lines

@@ -36,8 +36,9 @@ 
     public function __construct($client = null, $params, $debug, $cpeLogger)
     {
         # Check if preper env vars are setup
-        if (!($region = getenv("AWS_DEFAULT_REGION")))
-            throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        if (!($region = getenv("AWS_DEFAULT_REGION"))) {
+                    throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        }
         
         parent::__construct($client, $params, $debug, $cpeLogger);
         
@@ -86,8 +87,7 @@ 
             curl_exec($ch);
             curl_close($ch);
             $chunk = $this->curl_data;
-        }
-        else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
+        } else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
                  isset($this->input->{'input_asset'}->{'file'})) {
             // Fetch first 1 KiB of the file for Magic number validation
             $obj = $this->s3->getObject([
@@ -106,13 +106,14 @@ 
             'file -b --mime-type '.escapeshellarg($tmpFile))['out']);
         $type = substr($mime, 0, strpos($mime, '/'));
 
-        if ($this->debug)
-            $this->cpeLogger->logOut(
+        if ($this->debug) {
+                    $this->cpeLogger->logOut(
                 "DEBUG",
                 basename(__FILE__),
                 "File meta information gathered. Mime: $mime | Type: $type",
                 $this->logKey
         );
+        }
 
         // Load the right transcoder base on input_type
         // Get asset detailed info
@@ -190,15 +191,18 @@ 
     global $name;
     
     // Handle input parameters
-    if (!($options = getopt("N:A:l:C:hd")))
-        usage();
+    if (!($options = getopt("N:A:l:C:hd"))) {
+            usage();
+    }
     
-    if (isset($options['h']))
-        usage();
+    if (isset($options['h'])) {
+            usage();
+    }
 
     // Debug
-    if (isset($options['d']))
-        $debug = true;
+    if (isset($options['d'])) {
+            $debug = true;
+    }
 
     if (isset($options['A']) && $options['A']) {
         $arn = $options['A'];
@@ -217,9 +221,10 @@ 
         $name = $options['N'];
     }
     
-    if (isset($options['l']))
-        $logPath = $options['l'];
-}
+    if (isset($options['l'])) {
+            $logPath = $options['l'];
+    }
+    }
 
 
 /*

src/activities/BasicActivity.php

Braces +7 added lines, -6 removed lines

@@ -76,16 +76,18 @@ 
         // Create the tmp folder if doesn't exist
         if (!file_exists($this->tmpInputPath)) 
         {
-            if ($this->debug)
-                $this->cpeLogger->logOut("DEBUG", basename(__FILE__), 
+            if ($this->debug) {
+                            $this->cpeLogger->logOut("DEBUG", basename(__FILE__), 
                                          "Creating TMP input folder '".$this->tmpInputPath."'",
                                          $this->logKey);
+            }
             
-            if (!mkdir($this->tmpInputPath, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($this->tmpInputPath, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$this->tmpInputPath' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
         
         $this->inputFilePath = null;
@@ -93,8 +95,7 @@ 
         {
             // Pad HTTP input so it is cached in case of full encodes
             $this->inputFilePath = 'cache:' . $this->input->{'input_asset'}->{'http'};
-        }
-        else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
+        } else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
                  isset($this->input->{'input_asset'}->{'file'}))
         {
             // Download input file and store it in TMP folder

src/scripts/putInS3.php

Braces +13 added lines, -10 removed lines

@@ -21,8 +21,9 @@ 
 function check_input_parameters(&$options)
 {
     if (!count($options) || isset($options['h']) ||
-        isset($options['help']))
-        usage();
+        isset($options['help'])) {
+            usage();
+    }
     
     if (!isset($options['bucket']) || !isset($options['file']) ||
         !isset($options['from']))
@@ -46,8 +47,9 @@ 
 
 try {
     # Check if preper env vars are setup
-    if (!($region = getenv("AWS_DEFAULT_REGION")))
-        throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+    if (!($region = getenv("AWS_DEFAULT_REGION"))) {
+            throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+    }
         
     // Get S3 client
     $s3 = new \Aws\S3\S3Client([
@@ -62,10 +64,12 @@ 
     );
 
     // StorageClass and Encryption ?
-    if (isset($options['rrs']))
-        $params['StorageClass'] = 'REDUCED_REDUNDANCY';
-    if (isset($options['encrypt']))
-        $params['ServerSideEncryption'] = 'AES256';
+    if (isset($options['rrs'])) {
+            $params['StorageClass'] = 'REDUCED_REDUNDANCY';
+    }
+    if (isset($options['encrypt'])) {
+            $params['ServerSideEncryption'] = 'AES256';
+    }
     
     // Upload and Save file to S3
     $s3->putObject($params); 
@@ -73,8 +77,7 @@ 
     // Print JSON error output
     print json_encode([ "status" => "SUCCESS",
             "msg" => "[".__FILE__."] Upload '" . $options['from'] . "' to '" . $options['bucket'] . "/" . $options['file']  . "' successful !" ]);
-} 
-catch (Exception $e) {
+} catch (Exception $e) {
     $err = "Unable to put file '" . $options['from']  . "' into S3: '" . $options['bucket'] . "/" . $options['file']  . "'! " . $e->getMessage();
     
     // Print JSON error output

src/scripts/getFromS3.php

Braces +9 added lines, -6 removed lines

@@ -20,13 +20,15 @@ 
 function check_input_parameters($options)
 {
     if (!count($options) || isset($options['h']) ||
-        isset($options['help']))
-        usage();
+        isset($options['help'])) {
+            usage();
+    }
 
     if (!isset($options['bucket']) || !isset($options['file']) ||
-        !isset($options['to']))
-        throw new \SA\CpeSdk\CpeException("Missing mandatory parameter!");
-}
+        !isset($options['to'])) {
+            throw new \SA\CpeSdk\CpeException("Missing mandatory parameter!");
+    }
+    }
 
 $options = getopt("h", array("bucket:", "file:", "to:", "force::", "help::"));
 check_input_parameters($options);
@@ -43,8 +45,9 @@ 
 }
 
 # Check if preper env vars are setup
-if (!($region = getenv("AWS_DEFAULT_REGION")))
+if (!($region = getenv("AWS_DEFAULT_REGION"))) {
     throw new \SA\CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+}
 
 // Get S3 client
 $s3 = new \Aws\S3\S3Client([

src/utils/CommandExecuter.php

Braces +15 added lines, -10 removed lines

@@ -35,8 +35,9 @@ 
         $callbackTurns = 0,
         $logKey = null)
     {
-        if ($logKey)
-            $this->logKey = $logKey;
+        if ($logKey) {
+                    $this->logKey = $logKey;
+        }
         
         $this->cpeLogger->logOut("INFO", basename(__FILE__), "Executing: $cmd", $this->logKey);
 
@@ -111,10 +112,12 @@ 
             $i++;
         } while ($procStatus['running']);
 
-        if (isset($pipes[1]))
-            fclose($pipes[1]);
-        if (isset($pipes[2]))
-            fclose($pipes[2]);
+        if (isset($pipes[1])) {
+                    fclose($pipes[1]);
+        }
+        if (isset($pipes[2])) {
+                    fclose($pipes[2]);
+        }
 
         if ($procStatus['exitcode'] > 0)
         {
@@ -122,14 +125,16 @@ 
                                      basename(__FILE__),
                                      "Can't execute: $cmd. Exit Code: ".$procStatus['exitcode'],
                                      $this->logKey);
-            if ($allOut)
-                $this->cpeLogger->logOut("ERROR",
+            if ($allOut) {
+                            $this->cpeLogger->logOut("ERROR",
                                          basename(__FILE__), "COMMAND STDOUT: ".$allOut,
                                          $this->logKey);
-            if ($allOutErr)
-                $this->cpeLogger->logOut("ERROR",
+            }
+            if ($allOutErr) {
+                            $this->cpeLogger->logOut("ERROR",
                                          basename(__FILE__), "COMMAND STDERR: ".$allOutErr,
                                          $this->logKey);
+            }
         }
 
         if ($showProgress) {