Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

[videomega] Simplify (#3786)

Browse Source 
* Use raw strings (r'foo') for regular expressions (enables highlighting and avoids some errors).
* title is always true-ish
This commit is contained in:
Philipp Hagemeister 2014-09-18 00:18:27 +02:00
parent 67abbe9527
commit 0e59b9fffb
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/videomega.py
View File

@ -34,22 +34,20 @@ class VideoMegaIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
escaped_data = self._search_regex( escaped_data = self._search_regex(
'unescape\("([^"]+)"\)', webpage, 'escaped data') r'unescape\("([^"]+)"\)', webpage, 'escaped data')
playlist = compat_urllib_parse.unquote(escaped_data) playlist = compat_urllib_parse.unquote(escaped_data)
thumbnail = self._search_regex( thumbnail = self._search_regex(
r'image:\s*"([^"]+)"', playlist, 'thumbnail', fatal=False) r'image:\s*"([^"]+)"', playlist, 'thumbnail', fatal=False)
url = self._search_regex(r'file:\s*"([^"]+)"', playlist, 'URL') url = self._search_regex(r'file:\s*"([^"]+)"', playlist, 'URL')
title = self._html_search_regex( title = remove_start(self._html_search_regex(
r'<title>(.*?)</title>', webpage, 'title') r'<title>(.*?)</title>', webpage, 'title'), 'VideoMega.tv - ')
if title:
title = remove_start(title, 'VideoMega.tv - ')
formats = [] formats = [{
formats.append({
'format_id': 'sd', 'format_id': 'sd',
'url': url, 'url': url,
}) }]
self._sort_formats(formats)
return { return {
'id': video_id, 'id': video_id,