debian/control: Mark compliancy with policy 4.1.3 (no changes needed).

[youtubedl] / youtube_dl / extractor / viceland.py

diff --git a/youtube_dl/extractor/viceland.py b/youtube_dl/extractor/viceland.py
index 0eff055a6e5ce2ced15a618c82cadbf2c6c47a4a..bd60235c8845ac3c8662d4023478c06cd3ecb71b 100644 (file)
--- a/youtube_dl/extractor/viceland.py
+++ b/youtube_dl/extractor/viceland.py
@@ -1,22 +1,24 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
 # coding: utf-8
 from __future__ import unicode_literals
 

+import re
+

 from .vice import ViceBaseIE
 
 
 class VicelandIE(ViceBaseIE):
 from .vice import ViceBaseIE
 
 
 class VicelandIE(ViceBaseIE):

-    _VALID_URL = r'https?://(?:www\.)?viceland\.com/[^/]+/video/[^/]+/(?P<id>[a-f0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?viceland\.com/(?P<locale>[^/]+)/video/[^/]+/(?P<id>[a-f0-9]+)'

     _TEST = {
     _TEST = {

-        'url': 'https://www.viceland.com/en_us/video/cyberwar-trailer/57608447973ee7705f6fbd4e',
+        'url': 'https://www.viceland.com/en_us/video/trapped/588a70d0dba8a16007de7316',

         'info_dict': {
         'info_dict': {

-            'id': '57608447973ee7705f6fbd4e',
+            'id': '588a70d0dba8a16007de7316',

             'ext': 'mp4',
             'ext': 'mp4',

-            'title': 'CYBERWAR (Trailer)',
-            'description': 'Tapping into the geopolitics of hacking and surveillance, Ben Makuch travels the world to meet with hackers, government officials, and dissidents to investigate the ecosystem of cyberwarfare.',
+            'title': 'TRAPPED (Series Trailer)',
+            'description': 'md5:7a8e95c2b6cd86461502a2845e581ccf',

             'age_limit': 14,
             'age_limit': 14,

-            'timestamp': 1466008539,
-            'upload_date': '20160615',
-            'uploader_id': '11',
+            'timestamp': 1485474122,
+            'upload_date': '20170126',
+            'uploader_id': '57a204098cb727dec794c6a3',

             'uploader': 'Viceland',
         },
         'params': {
             'uploader': 'Viceland',
         },
         'params': {


@@ -24,10 +26,13 @@ class VicelandIE(ViceBaseIE):
             'skip_download': True,
         },
         'add_ie': ['UplynkPreplay'],
             'skip_download': True,
         },
         'add_ie': ['UplynkPreplay'],

+        'skip': '404',

     }
     _PREPLAY_HOST = 'www.viceland'
 
     def _real_extract(self, url):
     }
     _PREPLAY_HOST = 'www.viceland'
 
     def _real_extract(self, url):

-        video_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('id')
+        locale = mobj.group('locale')

         webpage = self._download_webpage(url, video_id)
         webpage = self._download_webpage(url, video_id)

-        return self._extract_preplay_video(url, webpage)
+        return self._extract_preplay_video(url, locale, webpage)