v1.1 and subtitles fix

Author: NikitaYeryomin

src/Classes/TranscodingTask.php

@@ -145,14 +145,41 @@ public function getLastStatus() {
     }
 
     private $subtitles;
+    private function initSubtitles() {
+        $this->subtitles = new \stdClass();
+        $this->subtitles->sources = array();
+        $this->subtitles->copy = 0;
+    }
 
+    /**
+     * Adds subtitles to a task
+     * @param $source Subtitles file URL
+     * @param $language Subtitles file language
+     */
     public function addSubtitles($source, $language) {
         if ($this->subtitles == null) {
-            $this->subtitles = array();
+            $this->initSubtitles();
         }
         $sub = new \stdClass();
         $sub->source = $source;
         $sub->language = $language;
-        $this->subtitles[] = $sub;
+        $this->subtitles->sources[] = $sub;
+    }
+
+    /**
+     * Sets subtitles / closed captions copy mode: 0 - disabled (default), 1 - existing eia608 or eia708 closed captions
+     * are copied to output stream
+     * @param $value
+     */
+    public function setSubtitlesCopyMode($value) {
+        if ($this->subtitles == null) {
+            $this->initSubtitles();
+        }
+        if ($value) {
+            $this->subtitles->copy = 1;
+        }
+        else {
+            $this->subtitles->copy = 0;
+        }
     }
 }

src/QencodeApiClient.php

@@ -24,8 +24,9 @@ class QencodeApiClient
 
     public $url = 'https://api.qencode.com/';
     public $version = 'v1';
+    private $supported_versions = array('v1', 'v1.1');
 
-    const USER_AGENT = 'Qencode PHP API SDK 1.0';
+    const USER_AGENT = 'Qencode PHP API SDK 1.1';
 
     /**
      * Maximum amount of time in seconds that is allowed to make the connection to the API server
@@ -42,9 +43,10 @@ class QencodeApiClient
     /**
      * @param string $key Qencode Project API key
      * @param string $url Optional url to any different API endpoint
+     * @param string $version Optional API version
      * @throws \Qencode\Exceptions\QencodeException if the library failed to initialize
      */
-    public function __construct($key, $url = null)
+    public function __construct($key, $url = null, $version = null)
     {
         if (strlen($key) < 12) {
             throw new QencodeException('Missing or invalid Qencode project api key!');
@@ -55,10 +57,25 @@ public function __construct($key, $url = null)
             }
             $this->url = $url;
         }
+        if ($version) {
+            $version = strtolower($version);
+            if (in_array($version, $this->supported_versions)) {
+                $this->version = $version;
+                if ($version == 'v1.1') {
+                    $this->url = $this->v1_1_get_endpoint();
+                }
+            }
+            else throw new QencodeException('Unsupported API version: '.$version);
+        }
         $this->key = $key;
         $this->getAccessToken();
     }
 
+    private function v1_1_get_endpoint() {
+        $api_host = file_get_contents($this->url.'/v1.1');
+        return 'https://'.$api_host;
+    }
+
     private function getAccessToken() {
         $response = $this->post("access_token", array('api_key' => $this->key));
         $this->access_token = $response['token'];
@@ -127,7 +144,7 @@ private function request($method, $path, array $params = [])
         else {
             $url = $this->url . '/' . $this->version . '/' . trim($path, '/');
         }
-
+        echo "URL: ".$url."\n";
         if (!empty($params) & is_array($params)) {
             $params = http_build_query($params);
         }