Update changelog.

[youtubedl] / youtube_dl / extractor / viu.py

diff --git a/youtube_dl/extractor/viu.py b/youtube_dl/extractor/viu.py
index db6a65d2ed93b233b050561c56fa7b6133ddb1b7..3bd37525b6ffcc53d8cb35bed9ab8974847893cc 100644 (file)
--- a/youtube_dl/extractor/viu.py
+++ b/youtube_dl/extractor/viu.py
@@ -4,7 +4,10 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..compat import compat_str
+from ..compat import (
+    compat_kwargs,
+    compat_str,
+)

 from ..utils import (
     ExtractorError,
     int_or_none,
 from ..utils import (
     ExtractorError,
     int_or_none,


@@ -36,7 +39,8 @@ class ViuBaseIE(InfoExtractor):
         headers.update(kwargs.get('headers', {}))
         kwargs['headers'] = headers
         response = self._download_json(
         headers.update(kwargs.get('headers', {}))
         kwargs['headers'] = headers
         response = self._download_json(

-            'https://www.viu.com/api/' + path, *args, **kwargs)['response']
+            'https://www.viu.com/api/' + path, *args,
+            **compat_kwargs(kwargs))['response']

         if response.get('status') != 'success':
             raise ExtractorError('%s said: %s' % (
                 self.IE_NAME, response['message']), expected=True)
         if response.get('status') != 'success':
             raise ExtractorError('%s said: %s' % (
                 self.IE_NAME, response['message']), expected=True)


@@ -191,16 +195,29 @@ class ViuOTTIE(InfoExtractor):
         'skip': 'Geo-restricted to Hong Kong',
     }]
 
         'skip': 'Geo-restricted to Hong Kong',
     }]
 

+    _AREA_ID = {
+        'HK': 1,
+        'SG': 2,
+        'TH': 4,
+        'PH': 5,
+    }
+

     def _real_extract(self, url):
         country_code, video_id = re.match(self._VALID_URL, url).groups()
 
     def _real_extract(self, url):
         country_code, video_id = re.match(self._VALID_URL, url).groups()
 

+        query = {
+            'r': 'vod/ajax-detail',
+            'platform_flag_label': 'web',
+            'product_id': video_id,
+        }
+
+        area_id = self._AREA_ID.get(country_code.upper())
+        if area_id:
+            query['area_id'] = area_id
+

         product_data = self._download_json(
             'http://www.viu.com/ott/%s/index.php' % country_code, video_id,
         product_data = self._download_json(
             'http://www.viu.com/ott/%s/index.php' % country_code, video_id,

-            'Downloading video info', query={
-                'r': 'vod/ajax-detail',
-                'platform_flag_label': 'web',
-                'product_id': video_id,
-            })['data']
+            'Downloading video info', query=query)['data']

 
         video_data = product_data.get('current_product')
         if not video_data:
 
         video_data = product_data.get('current_product')
         if not video_data:


@@ -210,6 +227,9 @@ class ViuOTTIE(InfoExtractor):
             'https://d1k2us671qcoau.cloudfront.net/distribute_web_%s.php' % country_code,
             video_id, 'Downloading stream info', query={
                 'ccs_product_id': video_data['ccs_product_id'],
             'https://d1k2us671qcoau.cloudfront.net/distribute_web_%s.php' % country_code,
             video_id, 'Downloading stream info', query={
                 'ccs_product_id': video_data['ccs_product_id'],

+            }, headers={
+                'Referer': url,
+                'Origin': re.search(r'https?://[^/]+', url).group(0),

             })['data']['stream']
 
         stream_sizes = stream_data.get('size', {})
             })['data']['stream']
 
         stream_sizes = stream_data.get('size', {})