projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xhamster] Remove identical tests
[youtube-dl]
/
youtube_dl
/
extractor
/
defense.py
diff --git
a/youtube_dl/extractor/defense.py
b/youtube_dl/extractor/defense.py
index 6069c4538efbf69c83d7b1c665bf7eefc0743a5d..5e50c63d9aca7d2642239ccf32a5cedd91b05174 100644
(file)
--- a/
youtube_dl/extractor/defense.py
+++ b/
youtube_dl/extractor/defense.py
@@
-7,9
+7,9
@@
from .common import InfoExtractor
class DefenseGouvFrIE(InfoExtractor):
class DefenseGouvFrIE(InfoExtractor):
-
_
IE_NAME = 'defense.gouv.fr'
+ IE_NAME = 'defense.gouv.fr'
_VALID_URL = (r'http://.*?\.defense\.gouv\.fr/layout/set/'
_VALID_URL = (r'http://.*?\.defense\.gouv\.fr/layout/set/'
- r'ligthboxvideo/base-de-medias/webtv/(.*)')
+
r'ligthboxvideo/base-de-medias/webtv/(.*)')
_TEST = {
'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
_TEST = {
'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
@@
-26,13
+26,13
@@
class DefenseGouvFrIE(InfoExtractor):
video_id = self._search_regex(
r"flashvars.pvg_id=\"(\d+)\";",
webpage, 'ID')
video_id = self._search_regex(
r"flashvars.pvg_id=\"(\d+)\";",
webpage, 'ID')
-
+
json_url = ('http://static.videos.gouv.fr/brightcovehub/export/json/'
json_url = ('http://static.videos.gouv.fr/brightcovehub/export/json/'
- + video_id)
+
+ video_id)
info = self._download_webpage(json_url, title,
info = self._download_webpage(json_url, title,
-
'Downloading JSON config')
+ 'Downloading JSON config')
video_url = json.loads(info)['renditions'][0]['url']
video_url = json.loads(info)['renditions'][0]['url']
-
+
return {'id': video_id,
'ext': 'mp4',
'url': video_url,
return {'id': video_id,
'ext': 'mp4',
'url': video_url,