mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-11 17:46:22 +02:00
[france2.fr:generation-quoi] Modernize
This commit is contained in:
parent
9a3e5e6955
commit
c4e817ce4a
@ -230,12 +230,13 @@ class FranceTVIE(FranceTVBaseInfoExtractor):
|
|||||||
|
|
||||||
class GenerationQuoiIE(InfoExtractor):
|
class GenerationQuoiIE(InfoExtractor):
|
||||||
IE_NAME = 'france2.fr:generation-quoi'
|
IE_NAME = 'france2.fr:generation-quoi'
|
||||||
_VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<name>.*)(\?|$)'
|
_VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<id>[^/?#]+)'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://generation-quoi.france2.fr/portrait/garde-a-vous',
|
'url': 'http://generation-quoi.france2.fr/portrait/garde-a-vous',
|
||||||
'file': 'k7FJX8VBcvvLmX4wA5Q.mp4',
|
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
'id': 'k7FJX8VBcvvLmX4wA5Q',
|
||||||
|
'ext': 'mp4',
|
||||||
'title': 'Génération Quoi - Garde à Vous',
|
'title': 'Génération Quoi - Garde à Vous',
|
||||||
'uploader': 'Génération Quoi',
|
'uploader': 'Génération Quoi',
|
||||||
},
|
},
|
||||||
@ -243,14 +244,12 @@ class GenerationQuoiIE(InfoExtractor):
|
|||||||
# It uses Dailymotion
|
# It uses Dailymotion
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
'skip': 'Only available from France',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
display_id = self._match_id(url)
|
||||||
name = mobj.group('name')
|
info_url = compat_urlparse.urljoin(url, '/medias/video/%s.json' % display_id)
|
||||||
info_url = compat_urlparse.urljoin(url, '/medias/video/%s.json' % name)
|
info_json = self._download_webpage(info_url, display_id)
|
||||||
info_json = self._download_webpage(info_url, name)
|
|
||||||
info = json.loads(info_json)
|
info = json.loads(info_json)
|
||||||
return self.url_result('http://www.dailymotion.com/video/%s' % info['id'],
|
return self.url_result('http://www.dailymotion.com/video/%s' % info['id'],
|
||||||
ie='Dailymotion')
|
ie='Dailymotion')
|
||||||
|
Loading…
Reference in New Issue
Block a user