]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[canalc2] Improve some regexes
authorSergey M․ <dstftw@gmail.com>
Sun, 18 Oct 2015 13:23:31 +0000 (19:23 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 18 Oct 2015 13:23:31 +0000 (19:23 +0600)
youtube_dl/extractor/canalc2.py

index 648af2e18ba62afdc8a5558cd74c6e1ad7256a82..d9137e2efc0cee5f75cc8fc74f8184e81300bc81 100644 (file)
@@ -8,7 +8,7 @@ from .common import InfoExtractor
 
 class Canalc2IE(InfoExtractor):
     IE_NAME = 'canalc2.tv'
-    _VALID_URL = r'https?://(www\.)?canalc2\.tv/video/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?canalc2\.tv/video/(?P<id>\d+)'
 
     _TEST = {
         'url': 'http://www.canalc2.tv/video/12163',
@@ -27,8 +27,8 @@ class Canalc2IE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         video_url = self._search_regex(
-            r'jwplayer\("Player"\).setup\({[^}]*file: "([^"]+)"',
-            webpage, 'video_url')
+            r'jwplayer\((["\'])Player\1\)\.setup\({[^}]*file\s*:\s*(["\'])(?P<file>.+?)\2',
+            webpage, 'video_url', group='file')
         formats = [{'url': video_url}]
         if video_url.startswith('rtmp://'):
             rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+/))(?P<play_path>mp4:.+)$', video_url)