projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f66eed
)
[goshgay] PEP8 and test for age_limit (#3220)
author
Philipp Hagemeister
<phihag@phihag.de>
Fri, 11 Jul 2014 09:01:59 +0000
(11:01 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Fri, 11 Jul 2014 09:01:59 +0000
(11:01 +0200)
youtube_dl/extractor/goshgay.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/goshgay.py
b/youtube_dl/extractor/goshgay.py
index 3f31ec896f48e5de0cee24c265e38467dca3d684..7bca21ad0fe81c71444bfe64fb23ea3ad62c6c5b 100644
(file)
--- a/
youtube_dl/extractor/goshgay.py
+++ b/
youtube_dl/extractor/goshgay.py
@@
-22,6
+22,7
@@
class GoshgayIE(InfoExtractor):
'ext': 'flv',
'title': 'md5:089833a4790b5e103285a07337f245bf',
'thumbnail': 're:http://.*\.jpg',
'ext': 'flv',
'title': 'md5:089833a4790b5e103285a07337f245bf',
'thumbnail': 're:http://.*\.jpg',
+ 'age_limit': 18,
}
}
}
}
@@
-32,8
+33,8
@@
class GoshgayIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
title = self._search_regex(r'class="video-title"><h1>(.+?)<', webpage, 'title')
webpage = self._download_webpage(url, video_id)
title = self._search_regex(r'class="video-title"><h1>(.+?)<', webpage, 'title')
- player_config = self._search_regex(
r'jwplayer\("player"\)\.setup\(({.+?})\)', webpage, 'config settings',
-
fatal=True, flags=re.S
)
+ player_config = self._search_regex(
+
r'(?s)jwplayer\("player"\)\.setup\(({.+?})\)', webpage, 'config settings'
)
player_vars = json.loads(player_config.replace("'", '"'))
width = str_to_int(player_vars.get('width'))
height = str_to_int(player_vars.get('height'))
player_vars = json.loads(player_config.replace("'", '"'))
width = str_to_int(player_vars.get('width'))
height = str_to_int(player_vars.get('height'))