[canalc2] Improve rtmp extraction
authorSergey M․ <dstftw@gmail.com>
Sun, 18 Oct 2015 13:19:43 +0000 (19:19 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 18 Oct 2015 13:19:43 +0000 (19:19 +0600)
youtube_dl/extractor/canalc2.py

index 66a9ff093f67a8c05420ac82866eb27d07bb4508..648af2e18ba62afdc8a5558cd74c6e1ad7256a82 100644 (file)
@@ -31,10 +31,12 @@ class Canalc2IE(InfoExtractor):
             webpage, 'video_url')
         formats = [{'url': video_url}]
         if video_url.startswith('rtmp://'):
-            rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<play_path>mp4:.+)$', video_url)
+            rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+/))(?P<play_path>mp4:.+)$', video_url)
             formats[0].update({
+                'url': rtmp.group('url'),
                 'app': rtmp.group('app'),
                 'play_path': rtmp.group('play_path'),
+                'page_url': url,
             })
 
         title = self._html_search_regex(