fix get_stream_url for abs asset_name

dailymotion · Sep 12, 2012 · 00f4c0a · 00f4c0a
1 parent e613975
commit 00f4c0a
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/CloudKey.php b/CloudKey.php
@@ -105,7 +105,7 @@ public function get_stream_url($args)
         $protocol = null;
         extract($args);
         if (!in_array($protocol, array(null, "hls", "rtmp", "hps", "http", "hds", "ss"))) {
-            throw new CloudKey_InvalidMethodException(sprintf('%s is not a valid streaming protocol', $protocol));
+            throw new CloudKey_InvalidParamException(sprintf('%s is not a valid streaming protocol', $protocol));
         }
         if ($extension == '')
         {
@@ -120,18 +120,27 @@ public function get_stream_url($args)
         {
             return sprintf('http://static.dmcloud.net/%s/%s/%s%s.%s', $this->user_id, $id, $asset_name, $version, $extension);
         }
-        else
+
+        if ($download or $filename)
         {
-            if ($download or $filename) {
-                $protocol = 'http';
-            }
-            $url = sprintf('%s/route%s/%s/%s/%s%s%s', $this->cdn_url, $protocol ? "/$protocol" : '', $this->user_id, $id, $asset_name, $version, $extension != '' ? ".$extension" : '');
-            if ($filename)
+            $protocol = 'http';
+        }
+
+        if ($asset_name == 'abs')
+        {
+            $extension = '';
+            if ($protocol == null)
             {
-                $url = sprintf('%s?filename=%s', $url, urlencode(utf8_encode($filename)));
+                throw new CloudKey_InvalidParamException('protocol is required for abs asset_name');
             }
-            return CloudKey_Helpers::sign_url($url, $this->api_key, $seclevel, $asnum, $ip, $useragent, $countries, $referers, $expires);
         }
+
+        $url = sprintf('%s/route%s/%s/%s/%s%s%s', $this->cdn_url, $protocol ? "/$protocol" : '', $this->user_id, $id, $asset_name, $version, $extension != '' ? ".$extension" : '');
+        if ($filename)
+        {
+            $url = sprintf('%s?filename=%s', $url, urlencode(utf8_encode($filename)));
+        }
+        return CloudKey_Helpers::sign_url($url, $this->api_key, $seclevel, $asnum, $ip, $useragent, $countries, $referers, $expires);
     }
 }