R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[jeuxvideo] Improve code quality (fixes #1567)

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-10-07 14:33:23 +02:00
parent 15870e90b0
commit faa6ef6bc8
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
youtube_dl/extractor/jeuxvideo.py
View File

@ -6,6 +6,7 @@ import xml.etree.ElementTree
from .common import InfoExtractor from .common import InfoExtractor
class JeuxVideoIE(InfoExtractor): class JeuxVideoIE(InfoExtractor):
_VALID_URL = r'http://.*?\.jeuxvideo\.com/.*/(.*?)-\d+\.htm' _VALID_URL = r'http://.*?\.jeuxvideo\.com/.*/(.*?)-\d+\.htm'
@ -23,25 +24,29 @@ class JeuxVideoIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
title = re.match(self._VALID_URL, url).group(1) title = re.match(self._VALID_URL, url).group(1)
webpage = self._download_webpage(url, title) webpage = self._download_webpage(url, title)
m_download = re.search(r'<param name="flashvars" value="config=(.*?)" />', webpage) xml_link = self._html_search_regex(
r'<param name="flashvars" value="config=(.*?)" />',
webpage, u'config URL')
xml_link = m_download.group(1) video_id = self._search_regex(
r'http://www\.jeuxvideo\.com/config/\w+/\d+/(.*?)/\d+_player\.xml',
xml_link, u'video ID')
id = re.search(r'http://www.jeuxvideo.com/config/\w+/0011/(.*?)/\d+_player\.xml', xml_link).group(1) xml_config = self._download_webpage(
xml_link, title, u'Downloading XML config')
xml_config = self._download_webpage(xml_link, title,
'Downloading XML config')
config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8')) config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8'))
info = re.search(r'<format\.json>(.*?)</format\.json>', info_json = self._search_regex(
xml_config, re.MULTILINE|re.DOTALL).group(1) r'(?sm)<format\.json>(.*?)</format\.json>',
info = json.loads(info)['versions'][0] xml_config, u'JSON information')
info = json.loads(info_json)['versions'][0]
video_url = 'http://video720.jeuxvideo.com/' + info['file'] video_url = 'http://video720.jeuxvideo.com/' + info['file']
return {'id': id, return {
'title' : config.find('titre_video').text, 'id': video_id,
'ext' : 'mp4', 'title': config.find('titre_video').text,
'url' : video_url, 'ext': 'mp4',
'description': self._og_search_description(webpage), 'url': video_url,
'thumbnail': config.find('image').text, 'description': self._og_search_description(webpage),
} 'thumbnail': config.find('image').text,
}