aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--youtube_dl/extractor/auengine.py18
2 files changed, 9 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 86312d4e4..0422adf44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@ updates_key.pem
test/testdata
.tox
youtube-dl.zsh
+.idea
+.idea/* \ No newline at end of file
diff --git a/youtube_dl/extractor/auengine.py b/youtube_dl/extractor/auengine.py
index 014a21952..17c3ad2ef 100644
--- a/youtube_dl/extractor/auengine.py
+++ b/youtube_dl/extractor/auengine.py
@@ -29,17 +29,12 @@ class AUEngineIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
title = self._html_search_regex(r'<title>(?P<title>.+?)</title>', webpage, 'title')
title = title.strip()
- links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
- links = map(compat_urllib_parse.unquote, links)
-
- thumbnail = None
- video_url = None
- for link in links:
- if link.endswith('.png'):
- thumbnail = link
- elif '/videos/' in link:
- video_url = link
- if not video_url:
+ video_url = re.findall(r'http://\w+.auengine.com/vod/.*[^\W]', webpage)
+ video_url = map(compat_urllib_parse.unquote, video_url)[0]
+ thumbnail = re.findall(r'http://\w+.auengine.com/thumb/.*[^\W]', webpage)
+ thumbnail = map(compat_urllib_parse.unquote, thumbnail)[0]
+
+ if video_url == "" and thumbnail =="":
raise ExtractorError('Could not find video URL')
ext = '.' + determine_ext(video_url)
if ext == title[-len(ext):]:
@@ -52,3 +47,4 @@ class AUEngineIE(InfoExtractor):
'thumbnail': thumbnail,
'http_referer': 'http://www.auengine.com/flowplayer/flowplayer.commercial-3.2.14.swf',
}
+