sportarchive / CloudTranscode

src/activities/BasicActivity.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
             isset($this->input->{'input_asset'}->{'file'}))
         {
             // Make pre-signed URL so ffmpeg has access to file
-            $this->pathToInputFile = 'cache:' .
+            $this->pathToInputFile = 'cache:'.
                 $this->s3->getCommand('GetObject', [
                     'Bucket' => $this->input->{'input_asset'}->{'bucket'},
                     'Key' => $this->input->{'input_asset'}->{'file'}
@@ -111,7 +111,7 @@ 
         else if ($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'};
+            $this->pathToInputFile = 'cache:'.$this->input->{'input_asset'}->{'http'};
         }
     }
     

src/activities/ValidateAssetActivity.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $tmpFile = tempname(sys_get_temp_dir(), 'ct');
         file_put_contents($tmpFile, $obj['Body']);
         $mime = trim((new CommandExecuter($this->cpeLogger))->execute(
-            'file -b --mime-type ' . escapeshellarg($tmpFile))['out']);
+            'file -b --mime-type '.escapeshellarg($tmpFile))['out']);
         $type = substr($mime, 0, strpos($mime, '/'));
 
         $this->cpeLogger->log_out(

src/activities/transcoders/AudioTranscoder.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/BasicTranscoder.php';
+require_once __DIR__.'/BasicTranscoder.php';
 
 class AudioTranscoder extends BasicTranscoder
 {

src/scripts/getFromS3.php

Spacing +9 added lines, -9 removed lines

@@ -4,13 +4,13 @@ 
  * Script used to get a file in AWS S3
  **/
 
-require __DIR__ . "/../../vendor/autoload.php";
+require __DIR__."/../../vendor/autoload.php";
 
 use Aws\S3\S3Client;
 
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " [-h] [--force] --bucket <s3 bucket> --file <filename> --to <filepath>\n");
+    echo("Usage: php ".basename(__FILE__)." [-h] [--force] --bucket <s3 bucket> --file <filename> --to <filepath>\n");
     echo("--help, -h: Print this help\n");
     echo("--bucket <s3 bucket>: Name of the S3 bucket\n");
     echo("--file <filename>: Name of the file in the S3 bucket\n");
@@ -41,8 +41,8 @@ 
     file_exists($options['to']) &&
     filesize($options['to']))
 {
-    print json_encode([ "status" => "SUCCESS",
-            "msg" => "[".__FILE__."] Using local copy: '" . $options['to']  . "'" ]);
+    print json_encode(["status" => "SUCCESS",
+            "msg" => "[".__FILE__."] Using local copy: '".$options['to']."'"]);
     exit(0);
 }
 
@@ -58,14 +58,14 @@ 
         ));
 
     // Print JSON error output
-    print json_encode([ "status" => "SUCCESS",
-            "msg" => "[".__FILE__."] Download '" . $options['bucket'] . "/" . $options['file'] . "' successful !" ]);
+    print json_encode(["status" => "SUCCESS",
+            "msg" => "[".__FILE__."] Download '".$options['bucket']."/".$options['file']."' successful !"]);
 } 
 catch (Exception $e) {
-    $err = "Unable to get '" . $options['bucket'] . "/" . $options['file'] . "' file from S3 ! " . $e->getMessage();
+    $err = "Unable to get '".$options['bucket']."/".$options['file']."' file from S3 ! ".$e->getMessage();
     // Print JSON error output
-    print json_encode([ "status" => "ERROR",
-            "msg" => "[".__FILE__."] $err" ]);
+    print json_encode(["status" => "ERROR",
+            "msg" => "[".__FILE__."] $err"]);
     
     die("[".__FILE__."] $err");
 }

src/scripts/putInS3.php

Spacing +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@ 
  * Script used to put a file in AWS S3
  **/
 
-require __DIR__ . "/../../vendor/autoload.php";
+require __DIR__."/../../vendor/autoload.php";
 
 use Aws\S3\S3Client;
 
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " [-h] [--rrs::] [--encrypt::] --bucket <s3 bucket> --file <filename> --from <filepath>\n");
+    echo("Usage: php ".basename(__FILE__)." [-h] [--rrs::] [--encrypt::] --bucket <s3 bucket> --file <filename> --from <filepath>\n");
     echo("--help, -h: Print this help\n");
     echo("--bucket <s3 bucket>: Name of the S3 bucket\n");
     echo("--file <filename>: Name of the file to create in bucket. You can override local filename.\n");
@@ -33,7 +33,7 @@ 
         usage();
     }
 
-    $options['bucket'] = rtrim( $options['bucket'], "/");
+    $options['bucket'] = rtrim($options['bucket'], "/");
 }
 
 $options = getopt("h", [
@@ -66,15 +66,15 @@ 
     $s3->putObject($params); 
     
     // Print JSON error output
-    print json_encode([ "status" => "SUCCESS",
-            "msg" => "[".__FILE__."] Upload '" . $options['from'] . "' to '" . $options['bucket'] . "/" . $options['file']  . "' successful !" ]);
+    print json_encode(["status" => "SUCCESS",
+            "msg" => "[".__FILE__."] Upload '".$options['from']."' to '".$options['bucket']."/".$options['file']."' successful !"]);
 } 
 catch (Exception $e) {
-    $err = "Unable to put file '" . $options['from']  . "' into S3: '" . $options['bucket'] . "/" . $options['file']  . "'! " . $e->getMessage();
+    $err = "Unable to put file '".$options['from']."' into S3: '".$options['bucket']."/".$options['file']."'! ".$e->getMessage();
     
     // Print JSON error output
-    print json_encode([ "status" => "ERROR",
-            "msg" => "[".__FILE__."] $err" ]);
+    print json_encode(["status" => "ERROR",
+            "msg" => "[".__FILE__."] $err"]);
 
     die("[".__FILE__."] $err");
 }

src/utils/S3Utils.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * The scripts are executed using the CommandExecuter
   */
 
-require_once __DIR__ . '/CommandExecuter.php';
+require_once __DIR__.'/CommandExecuter.php';
 
 use SA\CpeSdk;
 
@@ -35,7 +35,7 @@ 
         $callback = null, 
         $callbackParams = null)
     {   
-        $cmd = "php " . __DIR__ . self::GET_FROM_S3;
+        $cmd = "php ".__DIR__.self::GET_FROM_S3;
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --to $saveFileTo";
@@ -57,7 +57,7 @@ 
         $callback = null, 
         $callbackParams = null)
     {
-        $cmd  = "php " . __DIR__ . self::PUT_IN_S3;
+        $cmd  = "php ".__DIR__.self::PUT_IN_S3;
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --from $pathToFileToSend";

src/activities/transcoders/VideoTranscoder.php

Spacing +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
  * We use ffprobe, ffmpeg and convert to analyse, transcode and manipulate videos and images (watermark)
  */
 
-require_once __DIR__ . '/BasicTranscoder.php';
+require_once __DIR__.'/BasicTranscoder.php';
 
 use SA\CpeSdk;
 
@@ -103,7 +103,7 @@ 
             $this->cpeLogger->log_out(
                 "INFO", 
                 basename(__FILE__), 
-                "Input Video metadata: " . print_r($metadata, true),
+                "Input Video metadata: ".print_r($metadata, true),
                 $this->activityLogKey
             );
         
@@ -140,7 +140,7 @@ 
             $this->cpeLogger->log_out(
                 "ERROR", 
                 basename(__FILE__), 
-                "Execution of command '".$ffmpegCmd."' failed: " . print_r($metadata, true). ". ".$e->getMessage(),
+                "Execution of command '".$ffmpegCmd."' failed: ".print_r($metadata, true).". ".$e->getMessage(),
                 $this->activityLogKey
             );
             return false;
@@ -183,7 +183,7 @@ 
         }
         
         // Append output filename to path
-        $pathToOutputFiles .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $pathToOutputFiles .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Replace ${output_file} by output filename and path to local disk
         $ffmpegCmd = preg_replace('/\$\{output_file\}/', $pathToOutputFiles, $ffmpegCmd);
 
@@ -243,7 +243,7 @@ 
         }
         
         // Create FFMpeg arguments
-        $ffmpegArgs =  " -i $pathToInputFile -y -threads 0";
+        $ffmpegArgs = " -i $pathToInputFile -y -threads 0";
         $ffmpegArgs .= " -s $size";
         $ffmpegArgs .= " -vcodec $videoCodec";
         $ffmpegArgs .= " -acodec $audioCodec";
@@ -254,9 +254,9 @@ 
         $ffmpegArgs .= " $watermarkOptions";
         
         // Append output filename to path
-        $pathToOutputFiles .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $pathToOutputFiles .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Final command
-        $ffmpegCmd  = "ffmpeg $ffmpegArgs $pathToOutputFiles";
+        $ffmpegCmd = "ffmpeg $ffmpegArgs $pathToOutputFiles";
             
         return ($ffmpegCmd);
     }
@@ -283,8 +283,8 @@ 
                 $snapshot_sec = $outputWanted->{'snapshot_sec'};
             }
                 
-            $time = gmdate("H:i:s", $snapshot_sec) . ".000";
-            $pathToOutputFiles .= "/" . $outputFileInfo['basename'];
+            $time = gmdate("H:i:s", $snapshot_sec).".000";
+            $pathToOutputFiles .= "/".$outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
         }
         else if ($outputWanted->{'mode'} == 'intervals')
@@ -295,14 +295,14 @@ 
                 $intervals = $outputWanted->{'intervals'};
             }
             
-            $pathToOutputFiles .= "/" . $outputFileInfo['filename'] . "%06d." 
+            $pathToOutputFiles .= "/".$outputFileInfo['filename']."%06d." 
                 . $outputFileInfo['extension'];
             $frameOptions = " -vf fps=fps=1/$intervals";
         }
 
         // Create FFMpeg arguments
-        $ffmpegArgs  =  " -i $pathToInputFile -y -threads 0";
-        $ffmpegArgs .= " -vf scale=" . $outputWanted->{'size'};
+        $ffmpegArgs  = " -i $pathToInputFile -y -threads 0";
+        $ffmpegArgs .= " -vf scale=".$outputWanted->{'size'};
         $ffmpegArgs .= " $frameOptions -f image2 -q:v 8";
 
         // Final command
@@ -333,7 +333,7 @@ 
             $this->activityLogKey);
 
         // Transform watermark for opacity
-        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply " . $watermarkOptions->{'opacity'} . " +channel $newWatermarkPath";
+        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply ".$watermarkOptions->{'opacity'}." +channel $newWatermarkPath";
 
         try {
             $out = $this->executer->execute($convertCmd, 1, 
@@ -362,7 +362,7 @@ 
         // Format options for FFMpeg
         $size      = $watermarkOptions->{'size'};
         $positions = $this->get_watermark_position($watermarkOptions);
-        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=" . $positions['x'] . ':' . $positions['y'] . " [out]\"";
+        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=".$positions['x'].':'.$positions['y']." [out]\"";
         
         return ($formattedOptions);
     }
@@ -379,10 +379,10 @@ 
             $positions['y'] = $watermarkOptions->{'y'};
         }
         if ($watermarkOptions->{'x'} < 0) {
-            $positions['x'] = 'main_w-overlay_w' . $watermarkOptions->{'x'};
+            $positions['x'] = 'main_w-overlay_w'.$watermarkOptions->{'x'};
         }
         if ($watermarkOptions->{'y'} < 0) {
-            $positions['y'] = 'main_h-overlay_h' . $watermarkOptions->{'y'};
+            $positions['y'] = 'main_h-overlay_h'.$watermarkOptions->{'y'};
         }
 
         return ($positions);
@@ -441,7 +441,7 @@ 
         if (!isset($outputWanted->{'allow_upscale'}) ||
             $outputWanted->{'allow_upscale'} == 'false')
         {
-            $metadata->{'size'} = $metadata->width . 'x' . $metadata->height;
+            $metadata->{'size'} = $metadata->width.'x'.$metadata->height;
             $inputSize       = $metadata->{'size'};
             $inputSizeSplit  = explode("x", $inputSize);
             $outputSizeSplit = explode("x", $size);
@@ -493,7 +493,7 @@ 
         // # finally, progress is easy
         $progress = 0;
         if ($done) {
-            $progress = round(($done/$duration)*100);
+            $progress = round(($done / $duration) * 100);
         }
         
         $this->cpeLogger->log_out(
@@ -528,7 +528,7 @@ 
         }
         
         $preset     = $output_wanted->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
 
         if (!($presetContent = file_get_contents($presetPath.$preset.".json"))) {
             throw new CpeSdk\CpeException("Can't open preset file !",
@@ -552,7 +552,7 @@ 
         }
 
         $preset     = $output->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
         
         if (!($files = scandir($presetPath))) {
             throw new CpeSdk\CpeException("Unable to open preset directory '$presetPath' !",