]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[spiegel] Modernize
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 13 Nov 2014 13:45:17 +0000 (14:45 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 13 Nov 2014 13:45:17 +0000 (14:45 +0100)
youtube_dl/extractor/spiegel.py

index 9ed7d3b39e227806971fe98f43e1c1018b84ad3c..4b4da43d1da12356705d275139ccbb409e5f1f85 100644 (file)
@@ -8,7 +8,7 @@ from ..utils import compat_urlparse
 
 
 class SpiegelIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?spiegel\.de/video/[^/]*-(?P<videoID>[0-9]+)(?:\.html)?(?:#.*)?$'
+    _VALID_URL = r'https?://(?:www\.)?spiegel\.de/video/[^/]*-(?P<id>[0-9]+)(?:\.html)?(?:#.*)?$'
     _TESTS = [{
         'url': 'http://www.spiegel.de/video/vulkan-tungurahua-in-ecuador-ist-wieder-aktiv-video-1259285.html',
         'md5': '2c2754212136f35fb4b19767d242f66e',
@@ -32,9 +32,7 @@ class SpiegelIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        m = re.match(self._VALID_URL, url)
-        video_id = m.group('videoID')
-
+        video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
         title = self._html_search_regex(
@@ -90,8 +88,7 @@ class SpiegelArticleIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
-        m = re.match(self._VALID_URL, url)
-        video_id = m.group('id')
+        video_id = self._match_id(url)
 
         webpage = self._download_webpage(url, video_id)
         video_link = self._search_regex(