aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/extractor')
-rwxr-xr-xyoutube_dl/extractor/cda.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/cda.py b/youtube_dl/extractor/cda.py
index 498d2c0d8..8af318703 100755
--- 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')