Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'Oteng/master'

Browse Source
This commit is contained in:
Philipp Hagemeister 2015-01-05 18:18:15 +01:00
commit 18c3c15391
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,3 +31,5 @@ updates_key.pem
test/testdata
.tox
youtube-dl.zsh
.idea
.idea/*

16
youtube_dl/extractor/auengine.py
View File

@ -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)
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]
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:
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',
}