]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[vice] Modernize
authorSergey M․ <dstftw@gmail.com>
Sun, 19 Jul 2015 18:42:25 +0000 (00:42 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 19 Jul 2015 18:42:25 +0000 (00:42 +0600)
youtube_dl/extractor/vice.py

index ae1faca1cd6ece5d33a7950b858ec078b55b29e7..01af7a99574401b38e487b01dd5104e674740bbc 100644 (file)
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-import re
 
 from .common import InfoExtractor
 from .ooyala import OoyalaIE
@@ -7,7 +6,7 @@ from ..utils import ExtractorError
 
 
 class ViceIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:.+?\.)?vice\.com/.*?/(?P<name>.+)'
+    _VALID_URL = r'https?://(?:.+?\.)?vice\.com/(?:[^/]+/)+(?P<id>.+)'
 
     _TESTS = [
         {
@@ -28,9 +27,8 @@ class ViceIE(InfoExtractor):
     ]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        name = mobj.group('name')
-        webpage = self._download_webpage(url, name)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         try:
             embed_code = self._search_regex(
                 r'embedCode=([^&\'"]+)', webpage,