projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15870e9
)
[jeuxvideo] Improve code quality (fixes #1567)
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 7 Oct 2013 12:33:23 +0000
(14:33 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 7 Oct 2013 12:33:23 +0000
(14:33 +0200)
youtube_dl/extractor/jeuxvideo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/jeuxvideo.py
b/youtube_dl/extractor/jeuxvideo.py
index ae2e37a7083679323c792224ef6d34cfe6159666..6bb54b932298395b8f07554b12ad6091cca140d3 100644
(file)
--- a/
youtube_dl/extractor/jeuxvideo.py
+++ b/
youtube_dl/extractor/jeuxvideo.py
@@
-6,6
+6,7
@@
import xml.etree.ElementTree
from .common import InfoExtractor
from .common import InfoExtractor
+
class JeuxVideoIE(InfoExtractor):
_VALID_URL = r'http://.*?\.jeuxvideo\.com/.*/(.*?)-\d+\.htm'
class JeuxVideoIE(InfoExtractor):
_VALID_URL = r'http://.*?\.jeuxvideo\.com/.*/(.*?)-\d+\.htm'
@@
-23,25
+24,29
@@
class JeuxVideoIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
title = re.match(self._VALID_URL, url).group(1)
webpage = self._download_webpage(url, title)
mobj = re.match(self._VALID_URL, url)
title = re.match(self._VALID_URL, url).group(1)
webpage = self._download_webpage(url, title)
- m_download = re.search(r'<param name="flashvars" value="config=(.*?)" />', webpage)
-
-
xml_link = m_download.group(1
)
+ xml_link = self._html_search_regex(
+ r'<param name="flashvars" value="config=(.*?)" />',
+
webpage, u'config URL'
)
- id = re.search(r'http://www.jeuxvideo.com/config/\w+/0011/(.*?)/\d+_player\.xml', xml_link).group(1)
+ video_id = self._search_regex(
+ r'http://www\.jeuxvideo\.com/config/\w+/\d+/(.*?)/\d+_player\.xml',
+ xml_link, u'video ID')
- xml_config = self._download_webpage(
xml_link, title,
-
'Downloading XML config')
+ xml_config = self._download_webpage(
+
xml_link, title, u
'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>',
- xml_config, re.MULTILINE|re.DOTALL).group(1)
- info = json.loads(info)['versions'][0]
+ info_json = self._search_regex(
+ r'(?sm)<format\.json>(.*?)</format\.json>',
+ 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,
- 'title' : config.find('titre_video').text,
- 'ext' : 'mp4',
- 'url' : video_url,
- 'description': self._og_search_description(webpage),
- 'thumbnail': config.find('image').text,
- }
+ return {
+ 'id': video_id,
+ 'title': config.find('titre_video').text,
+ 'ext': 'mp4',
+ 'url': video_url,
+ 'description': self._og_search_description(webpage),
+ 'thumbnail': config.find('image').text,
+ }