projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b1be5c
)
[gamespot] Fix regexp
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 22 Jan 2014 21:31:19 +0000
(22:31 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 22 Jan 2014 21:31:19 +0000
(22:31 +0100)
youtube_dl/extractor/gamespot.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/gamespot.py
b/youtube_dl/extractor/gamespot.py
index 380ebbe556355b8fc0f49e825fa15433d5180b0b..c9598ad3aa68eb940a8995fb0f739dbfb9d33fdf 100644
(file)
--- a/
youtube_dl/extractor/gamespot.py
+++ b/
youtube_dl/extractor/gamespot.py
@@
-28,7
+28,7
@@
class GameSpotIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
page_id = mobj.group('page_id')
webpage = self._download_webpage(url, page_id)
mobj = re.match(self._VALID_URL, url)
page_id = mobj.group('page_id')
webpage = self._download_webpage(url, page_id)
- data_video_json = self._search_regex(r'data-video=
\'(.*?)\'', webpage, u
'data video')
+ data_video_json = self._search_regex(r'data-video=
["\'](.*?)["\']', webpage,
'data video')
data_video = json.loads(unescapeHTML(data_video_json))
# Transform the manifest url to a link to the mp4 files
data_video = json.loads(unescapeHTML(data_video_json))
# Transform the manifest url to a link to the mp4 files
@@
-36,7
+36,7
@@
class GameSpotIE(InfoExtractor):
f4m_url = data_video['videoStreams']['f4m_stream']
f4m_path = compat_urlparse.urlparse(f4m_url).path
QUALITIES_RE = r'((,\d+)+,?)'
f4m_url = data_video['videoStreams']['f4m_stream']
f4m_path = compat_urlparse.urlparse(f4m_url).path
QUALITIES_RE = r'((,\d+)+,?)'
- qualities = self._search_regex(QUALITIES_RE, f4m_path,
u
'qualities').strip(',').split(',')
+ qualities = self._search_regex(QUALITIES_RE, f4m_path, 'qualities').strip(',').split(',')
http_path = f4m_path[1:].split('/', 1)[1]
http_template = re.sub(QUALITIES_RE, r'%s', http_path)
http_template = http_template.replace('.csmil/manifest.f4m', '')
http_path = f4m_path[1:].split('/', 1)[1]
http_template = re.sub(QUALITIES_RE, r'%s', http_path)
http_template = http_template.replace('.csmil/manifest.f4m', '')