sportarchive / CloudTranscode

src/scripts/getFromS3.php

Braces +4 added lines, -4 removed lines

@@ -22,8 +22,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['to']))
@@ -60,8 +61,7 @@ 
     // Print JSON error output
     print json_encode([ "status" => "SUCCESS",
             "msg" => "[".__FILE__."] Download '" . $options['bucket'] . "/" . $options['file'] . "' successful !" ]);
-} 
-catch (Exception $e) {
+} catch (Exception $e) {
     $err = "Unable to get '" . $options['bucket'] . "/" . $options['file'] . "' file from S3 ! " . $e->getMessage();
     // Print JSON error output
     print json_encode([ "status" => "ERROR",

src/scripts/putInS3.php

Braces +10 added lines, -8 removed lines

@@ -23,8 +23,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']))
@@ -57,10 +58,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); 
@@ -68,8 +71,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/utils/CommandExecuter.php

Braces +9 added lines, -6 removed lines

@@ -17,8 +17,9 @@ 
     
     public function __construct($cpeLogger = null)
     {
-        if (!$cpeLogger)
-            $this->cpeLogger = new CpeSdk\CpeLogger(null, 'CommandExecuter');
+        if (!$cpeLogger) {
+                    $this->cpeLogger = new CpeSdk\CpeLogger(null, 'CommandExecuter');
+        }
         $this->cpeLogger = $cpeLogger;
     }
     
@@ -112,10 +113,12 @@ 
         if ($procStatus['exitcode'] > 0)
         {
             $this->cpeLogger->log_out("ERROR", basename(__FILE__), "Can't execute: $cmd. Exit Code: ".$procStatus['exitcode']);
-            if ($allOut)
-                $this->cpeLogger->log_out("ERROR", basename(__FILE__), "COMMAND STDOUT: ".$allOut);
-            if ($allOutErr)
-                $this->cpeLogger->log_out("ERROR", basename(__FILE__), "COMMAND STDERR: ".$allOutErr);
+            if ($allOut) {
+                            $this->cpeLogger->log_out("ERROR", basename(__FILE__), "COMMAND STDOUT: ".$allOut);
+            }
+            if ($allOutErr) {
+                            $this->cpeLogger->log_out("ERROR", basename(__FILE__), "COMMAND STDERR: ".$allOutErr);
+            }
         }
         
         if ($showProgress) {

src/utils/S3Utils.php

Braces +21 added lines, -14 removed lines

@@ -22,8 +22,9 @@ 
     
     public function __construct($cpeLogger = null)
     {
-        if (!$cpeLogger)
-            $this->cpeLogger = new CpeSdk\CpeLogger(null, 'S3Utils');
+        if (!$cpeLogger) {
+                    $this->cpeLogger = new CpeSdk\CpeLogger(null, 'S3Utils');
+        }
         $this->cpeLogger = $cpeLogger;
     }
 
@@ -61,10 +62,12 @@ 
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --from $pathToFileToSend";
-        if ($options['rrs'])
-            $cmd .= " --rrs";
-        if ($options['encrypt'])
-            $cmd .= " --encrypt";
+        if ($options['rrs']) {
+                    $cmd .= " --rrs";
+        }
+        if ($options['encrypt']) {
+                    $cmd .= " --encrypt";
+        }
     
         // HAndle execution
         return ($this->handle_s3_ops(
@@ -91,21 +94,25 @@ 
             true,
             5);
         
-        if ($out['outErr'])
-            throw new CpeSdk\CpeException($out['outErr'],
+        if ($out['outErr']) {
+                    throw new CpeSdk\CpeException($out['outErr'],
                 self::S3_OPS_FAILED);
+        }
 
-        if (!$out['out'])
-            throw new CpeSdk\CpeException("Script '$caller' didn't return any data !",
+        if (!$out['out']) {
+                    throw new CpeSdk\CpeException("Script '$caller' didn't return any data !",
                 self::NO_OUTPUT_DATA);
+        }
     
-        if (!($decoded = json_decode($out['out'], true)))
-            throw new CpeSdk\CpeException($out['out'],
+        if (!($decoded = json_decode($out['out'], true))) {
+                    throw new CpeSdk\CpeException($out['out'],
                 self::S3_OPS_FAILED);
+        }
     
-        if ($decoded["status"] == "ERROR")
-            throw new CpeSdk\CpeException($decoded["msg"],
+        if ($decoded["status"] == "ERROR") {
+                    throw new CpeSdk\CpeException($decoded["msg"],
                 self::S3_OPS_FAILED);
+        }
 
         return ($decoded);
     }

src/activities/TranscodeAssetActivity.php

Braces +12 added lines, -8 removed lines

@@ -67,8 +67,9 @@ 
 
             # If we have metadata, we expect the output of ffprobe
             $metadata = null;
-            if (isset($this->input->{'input_asset_metadata'})) 
-                $metadata = $this->input->{'input_asset_metadata'};
+            if (isset($this->input->{'input_asset_metadata'})) {
+                            $metadata = $this->input->{'input_asset_metadata'};
+            }
                 
             // Perform transcoding
             $result = $videoTranscoder->transcode_asset(
@@ -90,8 +91,9 @@ 
 
             # If we have metadata, we expect the output of ffprobe
             $metadata = null;
-            if (isset($this->input->{'input_asset_metadata'})) 
-                $metadata = $this->input->{'input_asset_metadata'};
+            if (isset($this->input->{'input_asset_metadata'})) {
+                            $metadata = $this->input->{'input_asset_metadata'};
+            }
             
             // Perform transcoding
             $result = $imageTranscoder->transcode_asset(
@@ -194,16 +196,18 @@ 
         
         if (!file_exists($this->pathToOutputFiles)) 
         {
-            if ($this->debug)
-                $this->cpeLogger->log_out("INFO", basename(__FILE__), 
+            if ($this->debug) {
+                            $this->cpeLogger->log_out("INFO", basename(__FILE__), 
                     "Creating TMP output folder '".$this->pathToOutputFiles."'",
                     $this->activityLogKey);
+            }
 
-            if (!mkdir($this->pathToOutputFiles, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($this->pathToOutputFiles, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$this->pathToOutputFiles' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
     }
     

src/activities/transcoders/VideoTranscoder.php

Braces +7 added lines, -10 removed lines

@@ -65,13 +65,14 @@ 
             $this->activityLogKey
         );
         
-        if ($metadata)
-            $this->cpeLogger->log_out(
+        if ($metadata) {
+                    $this->cpeLogger->log_out(
                 "INFO", 
                 basename(__FILE__), 
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->activityLogKey
             );
+        }
         
         try {
             $ffmpegCmd = "";
@@ -138,8 +139,7 @@ 
             // FFProbe the output file and return its information
             $output_info =
                 $this->get_asset_info($pathToOutputFiles."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
@@ -289,8 +289,7 @@ 
             $time = gmdate("H:i:s", $snapshot_sec) . ".000";
             $pathToOutputFiles .= "/" . $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'}) &&
@@ -343,8 +342,7 @@ 
                 array(1 => array("pipe", "w"), 2 => array("pipe", "w")),
                 false, false, 
                 false, 1);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
@@ -604,8 +602,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

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

src/activities/transcoders/ImageTranscoder.php

Braces +5 added lines, -6 removed lines

@@ -40,13 +40,14 @@ 
             $this->activityLogKey
         );
 
-        if ($metadata)
-            $this->cpeLogger->log_out(
+        if ($metadata) {
+                    $this->cpeLogger->log_out(
                 "INFO", 
                 basename(__FILE__), 
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->activityLogKey
             );
+        }
 
         try {
             $convertCmd = "";
@@ -67,8 +68,7 @@ 
                     $metadata, 
                     $outputWanted
                 );
-            }
-            else {
+            } else {
                 $convertCmd = $this->craft_convert_cmd(
                     $tmpPathInput,
                     $pathToInputFile,
@@ -112,8 +112,7 @@ 
             // FFProbe the output file and return its information
             $output_info =
                 $this->get_asset_info($pathToOutputFiles."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 

src/activities/BasicActivity.php

Braces +10 added lines, -8 removed lines

@@ -74,22 +74,25 @@ 
         
         $inputFileInfo = null;
         // Create TMP storage to store input file to transcode
-        if (isset($this->input->{'input_asset'}->{'file'}))
-            $inputFileInfo = pathinfo($this->input->{'input_asset'}->{'file'});
+        if (isset($this->input->{'input_asset'}->{'file'})) {
+                    $inputFileInfo = pathinfo($this->input->{'input_asset'}->{'file'});
+        }
         
         // Create the tmp folder if doesn't exist
         if (!file_exists($this->tmpPathInput)) 
         {
-            if ($this->debug)
-                $this->cpeLogger->log_out("INFO", basename(__FILE__), 
+            if ($this->debug) {
+                            $this->cpeLogger->log_out("INFO", basename(__FILE__), 
                     "Creating TMP input folder '".$this->tmpPathInput."'",
                     $this->activityLogKey);
+            }
             
-            if (!mkdir($this->tmpPathInput, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($this->tmpPathInput, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$this->tmpPathInput' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
             
         $this->pathToInputFile = null;
@@ -105,8 +108,7 @@ 
                     $this->input->{'input_asset'}->{'file'},
                     $saveFileTo
                 );
-        }
-        else if (isset($this->input->{'input_asset'}->{'http'}))
+        } else if (isset($this->input->{'input_asset'}->{'http'}))
         {
             // Pad HTTP input so it is cached in case of full encodes
             $this->pathToInputFile = 'cache:' . $this->input->{'input_asset'}->{'http'};