]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[go90] detect geo restriction error and pass geo verification headers(closes #16874)
authorRemita Amine <remitamine@gmail.com>
Sun, 1 Jul 2018 21:32:59 +0000 (22:32 +0100)
committerRemita Amine <remitamine@gmail.com>
Sun, 1 Jul 2018 21:41:32 +0000 (22:41 +0100)
youtube_dl/extractor/go90.py

index 35dde42d07143a3805c5f1cfd551001eb2a23de3..6f8c56a934cabd010a886991fb9639f6c9ba8dae 100644 (file)
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
+from ..compat import compat_HTTPError
 from ..utils import (
     determine_ext,
     ExtractorError,
@@ -28,14 +29,27 @@ class Go90IE(InfoExtractor):
             'age_limit': 14,
         }
     }
+    _GEO_BYPASS = False
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_data = self._download_json(
-            'https://www.go90.com/api/view/items/' + video_id,
-            video_id, headers={
+
+        try:
+            headers = self.geo_verification_headers()
+            headers.update({
                 'Content-Type': 'application/json; charset=utf-8',
-            }, data=b'{"client":"web","device_type":"pc"}')
+            })
+            video_data = self._download_json(
+                'https://www.go90.com/api/view/items/' + video_id, video_id,
+                headers=headers, data=b'{"client":"web","device_type":"pc"}')
+        except ExtractorError as e:
+            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
+                message = self._parse_json(e.cause.read().decode(), None)['error']['message']
+                if 'region unavailable' in message:
+                    self.raise_geo_restricted(countries=['US'])
+                raise ExtractorError(message, expected=True)
+            raise
+
         if video_data.get('requires_drm'):
             raise ExtractorError('This video is DRM protected.', expected=True)
         main_video_asset = video_data['main_video_asset']