add from cloud and fixes some minor bugs

Author: aminyazdanpanah

README.md

@@ -48,7 +48,8 @@
     },
     "require": {
         "php": "^7.1",
-        "php-ffmpeg/php-ffmpeg": "^0.14"
+        "php-ffmpeg/php-ffmpeg": "^0.14",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "scripts": {
         "test": "vendor/bin/phpunit"

composer.json

@@ -22,7 +22,7 @@ class AutoRepresentations
     /** @var array side_values
      * regular video's heights
      */
-    private $side_values = [2160, 1080, 720, 480, 240, 144];
+    private $side_values = [2160, 1080, 720, 480, 360, 240, 144];
 
     /**
      * AutoRepresentations constructor.
@@ -31,7 +31,7 @@ class AutoRepresentations
      */
     public function __construct(Stream $stream, $side_values)
     {
-        if(null !== $side_values){
+        if (null !== $side_values) {
             $this->side_values = $side_values;
         }
 

src/AutoRepresentations.php

@@ -11,6 +11,7 @@
 
 namespace Streaming;
 
+use Streaming\Exception\Exception;
 use Streaming\Filters\Filter;
 use Streaming\Traits\Formats;
 
@@ -40,10 +41,10 @@ public function __construct(Media $media)
     /**
      * @param string $path
      * @param bool $analyse
-     * @param bool $delete_original_video
      * @return mixed
+     * @throws Exception
      */
-    public function save(string $path = null, $analyse = true, $delete_original_video = false)
+    public function save(string $path = null, $analyse = true)
     {
         $path = $this->getPath($path);
 
@@ -58,12 +59,13 @@ public function save(string $path = null, $analyse = true, $delete_original_vide
             $path
         );
 
-        if ($delete_original_video) {
-            sleep(1);
-            @unlink($this->media->getPath());
+        $response = ($analyse) ? (new StreamingAnalytics($this))->analyse() : $path;
+
+        if ($this->media->isTmp()) {
+            $this->deleteOriginalFile();
         }
 
-        return ($analyse) ? (new StreamingAnalytics($this))->analyse() : $path;
+        return $response;
     }
 
     /**
@@ -76,12 +78,22 @@ abstract protected function getFilter(): Filter;
      */
     abstract protected function setFilter();
 
+    /**
+     * @param $path
+     * @return string
+     * @throws Exception
+     */
     private function getPath($path): string
     {
         if (null !== $path) {
             $this->path_info = pathinfo($path);
         }
 
+        if (null === $path && $this->media->isTmp()) {
+            $this->deleteOriginalFile();
+            throw new Exception("You need to specify a path. It is not possible to save to a tmp directory");
+        }
+
         $dirname = str_replace("\\", "/", $this->path_info["dirname"]);
         $filename = substr($this->path_info["filename"], -50);
 
@@ -113,4 +125,10 @@ public function getMedia()
     {
         return $this->media;
     }
-}
+
+    private function deleteOriginalFile()
+    {
+        sleep(1);
+        @unlink($this->media->getPath());
+    }
+}

src/Export.php

@@ -14,6 +14,9 @@
 use FFMpeg\FFMpeg as BFFMpeg;
 use FFMpeg\FFProbe;
 use Psr\Log\LoggerInterface;
+use Streaming\Exception\Exception;
+use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
+use Symfony\Component\Filesystem\Filesystem;
 
 class FFMpeg
 {
@@ -29,12 +32,49 @@ public function __construct(BFFMpeg $ffmpeg)
     }
 
     /**
-     * @param $path
+     * @param string $path
+     * @param bool $is_tmp
      * @return Media
+     * @throws Exception
      */
-    public function open($path): Media
+    public function open(string $path, bool $is_tmp = false): Media
     {
-        return new Media($this->ffmpeg->open($path), $path);
+        if (!is_file($path)) {
+            throw new Exception("There is no file in this path: " . $path);
+        }
+
+        return new Media($this->ffmpeg->open($path), $path, $is_tmp);
+    }
+
+    /**
+     * @param string $url
+     * @param string|null $save_to
+     * @param string $method
+     * @param $request_options
+     * @return Media
+     * @throws Exception
+     */
+    public function fromURL(string $url, string $save_to = null, string $method = "GET", $request_options = []): Media
+    {
+        $is_tmp = false;
+
+        if (null === $save_to) {
+            $is_tmp = true;
+            $tmp_path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . "php_ffmpeg_video_streaming";
+
+            Helper::makeDir($tmp_path);
+
+            $ext = "";
+            if (isset(pathinfo($url)["extension"])) {
+                $ext = "." . substr(explode("?", pathinfo($url)["extension"])[0], 0, 10);
+            }
+
+            $save_to = $tmp_path . DIRECTORY_SEPARATOR . Helper::randomString() . $ext;
+        }
+
+        Helper::downloadFile($url, $save_to, $method, $request_options);
+
+        return $this->open($save_to, $is_tmp);
     }
 
     /**
@@ -57,4 +97,4 @@ public static function create($config = array(), LoggerInterface $logger = null,
     {
         return new static(BFFMpeg::create($config, $logger, $probe));
     }
-}
+}

src/FFMpeg.php

@@ -20,7 +20,7 @@ class HLS extends Export
     use Representations;
 
     /** @var string */
-    private $hls_time = 5;
+    private $hls_time = 10;
 
     /** @var bool */
     private $hls_allow_cache = true;
@@ -83,12 +83,12 @@ public function setHlsKeyInfoFile(string $hls_key_info_file): HLS
      */
     public function generateRandomKeyInfo(string $url = null, string $path = null, string $binary = "openssl"): HLS
     {
-        if (null === $url && null === $path){
+        if (null === $url && null === $path) {
             $key_name = $url = Helper::randomString() . ".key";
             $path = $this->path_info["dirname"] . DIRECTORY_SEPARATOR . $key_name;
         }
 
-        $this->hls_key_info_file = (string) new KeyInfo($url, $path, $binary);
+        $this->hls_key_info_file = (string)new KeyInfo($url, $path, $binary);
         return $this;
     }
 

src/HLS.php

@@ -12,6 +12,12 @@
 namespace Streaming;
 
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Streaming\Exception\Exception;
+use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
+use Symfony\Component\Filesystem\Filesystem;
+
 class Helper
 {
     /**
@@ -25,15 +31,47 @@ public static function roundToEven(float $number): int
         return (($number = intval($number)) % 2 == 0) ? $number : $number + 1;
     }
 
-
     /**
      * @param $dirname
+     * @param int $mode
+     * @throws Exception
+     */
+    public static function makeDir($dirname, $mode = 0777): void
+    {
+        $filesystem = new Filesystem();
+
+        try {
+            $filesystem->mkdir($dirname, $mode);
+        } catch (IOExceptionInterface $exception) {
+            throw new Exception("An error occurred while creating your directory at " . $exception->getPath());
+        }
+    }
+
+    /**
+     * @param string $url
+     * @param string|null $save_to
+     * @param string $method
+     * @param array $request_options
+     * @throws Exception
      */
-    public static function makeDir($dirname): void
+    public static function downloadFile(string $url, string $save_to = null, string $method = "GET", $request_options = []): void
     {
-        if (!is_dir($dirname)) {
-            mkdir($dirname, 0777, true);
+        $request_options = array_merge($request_options, ['sink' => $save_to]);
+        $client = new Client();
+        try {
+            $client->request($method, $url, $request_options);
+        } catch (GuzzleException $e) {
+
+            $error = sprintf('The url("%s") is not downloadable:\n' . "\n\nExit Code: %s(%s)\n\nbody:\n: %s",
+                $url,
+                $e->getCode(),
+                $e->getMessage(),
+                $e->getResponse()->getBody()->getContents()
+            );
+
+            throw new Exception($error);
         }
+
     }
 
     /**

src/Helper.php

@@ -27,16 +27,23 @@ class Media
      * @var string
      */
     private $path;
+    /**
+     * @var bool
+     */
+    private $is_tmp;
+
 
     /**
      * Media constructor.
      * @param MediaTypeInterface $media
      * @param string $path
+     * @param bool $is_tmp
      */
-    public function __construct(MediaTypeInterface $media, string $path)
+    public function __construct(MediaTypeInterface $media, string $path, bool $is_tmp)
     {
         $this->media = $media;
         $this->path = $path;
+        $this->is_tmp = $is_tmp;
     }
 
     /**
@@ -99,4 +106,12 @@ public function getPath(): string
     {
         return $this->path;
     }
+
+    /**
+     * @return bool
+     */
+    public function isTmp(): bool
+    {
+        return $this->is_tmp;
+    }
 }

src/Media.php

@@ -23,7 +23,7 @@ class Process
     protected $commands = [];
 
     /**
-     * ShakaProcess constructor.
+     * Process constructor.
      * @param $binary
      * @throws Exception
      */
@@ -47,7 +47,7 @@ private function getBinary($binary)
             if ($binary = $finder->find($binary)) {
                 return $binary;
             } else {
-                throw new Exception("We could not find 'Shaka Packager' binary.\nPlease check the path to the shaka binary");
+                throw new Exception("We could not find the binary.\nPlease check the path to the binary");
             }
         }
     }

src/Process/Process.php

@@ -43,11 +43,11 @@ public function getRepresentations(): array
     }
 
     /**
-     * @param null $side_values
+     * @param array $side_values
      * @return $this
      * @throws Exception
      */
-    public function autoGenerateRepresentations($side_values = null)
+    public function autoGenerateRepresentations(array $side_values = null)
     {
         if (!$this->format) {
             throw new Exception('Format has not been set');