youtube-dl

commit 27e5fa8198a187c62cbe7275ebb474d3821bfaa4
parent efbd1eb51a9e940d01a2c02fd02c3778dd88b14b
Author: Sergey M․ <dstftw@gmail.com>
Date:   Thu, 16 Jun 2016 22:33:12 +0700

[cda] Fix extraction (Closes #9803)

Diffstat:
M
youtube_dl/extractor/cda.py
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/cda.py b/youtube_dl/extractor/cda.py
@@ -58,7 +58,8 @@ class CDAIE(InfoExtractor):
         def extract_format(page, version):
             unpacked = decode_packed_codes(page)
             format_url = self._search_regex(
-                r"url:\\'(.+?)\\'", unpacked, '%s url' % version, fatal=False)
+                r"(?:file|url)\s*:\s*(\\?[\"'])(?P<url>http.+?)\1", unpacked,
+                '%s url' % version, fatal=False, group='url')
             if not format_url:
                 return
             f = {
@@ -75,7 +76,8 @@ class CDAIE(InfoExtractor):
             info_dict['formats'].append(f)
             if not info_dict['duration']:
                 info_dict['duration'] = parse_duration(self._search_regex(
-                    r"duration:\\'(.+?)\\'", unpacked, 'duration', fatal=False))
+                    r"duration\s*:\s*(\\?[\"'])(?P<duration>.+?)\1",
+                    unpacked, 'duration', fatal=False, group='duration'))
 
         extract_format(webpage, 'default')