github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[indavideo] Relax _VALID_URL to match subdomains and add tests

Browse source
This commit is contained in:
Sergey M․ 2015-08-13 23:40:20 +06:00
parent 3c12a027d4
commit a34e19629c
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
youtube_dl/extractor/indavideo.py
View file

@ -44,7 +44,6 @@ class IndavideoEmbedIE(InfoExtractor):
'http://amfphp.indavideo.hu/SYm0json.php/player.playerHandler.getVideoData/%s' % video_id, 'http://amfphp.indavideo.hu/SYm0json.php/player.playerHandler.getVideoData/%s' % video_id,
video_id)['data'] video_id)['data']
video_id = video['id']
title = video['title'] title = video['title']
video_urls = video.get('video_files', []) video_urls = video.get('video_files', [])
@ -78,7 +77,7 @@ class IndavideoEmbedIE(InfoExtractor):
tags = [tag['title'] for tag in video.get('tags', [])] tags = [tag['title'] for tag in video.get('tags', [])]
return { return {
'id': video_id, 'id': video.get('id') or video_id,
'title': title, 'title': title,
'description': video.get('description'), 'description': video.get('description'),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
@ -93,8 +92,8 @@ class IndavideoEmbedIE(InfoExtractor):
class IndavideoIE(InfoExtractor): class IndavideoIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?indavideo\.hu/video/(?P<id>[^/#?]+)' _VALID_URL = r'https?://(?:.+?\.)?indavideo\.hu/video/(?P<id>[^/#?]+)'
_TEST = { _TESTS = [{
'url': 'http://indavideo.hu/video/Vicces_cica_1', 'url': 'http://indavideo.hu/video/Vicces_cica_1',
'md5': '8c82244ba85d2a2310275b318eb51eac', 'md5': '8c82244ba85d2a2310275b318eb51eac',
'info_dict': { 'info_dict': {
@ -112,7 +111,22 @@ class IndavideoIE(InfoExtractor):
'age_limit': 0, 'age_limit': 0,
'tags': ['vicces', 'macska', 'cica', 'ügyes', 'nevetés', 'játszik', 'Cukiság', 'Jet_Pack'], 'tags': ['vicces', 'macska', 'cica', 'ügyes', 'nevetés', 'játszik', 'Cukiság', 'Jet_Pack'],
}, },
} }, {
'url': 'http://index.indavideo.hu/video/2015_0728_beregszasz',
'only_matching': True,
}, {
'url': 'http://auto.indavideo.hu/video/Sajat_utanfutoban_a_kis_tacsko',
'only_matching': True,
}, {
'url': 'http://erotika.indavideo.hu/video/Amator_tini_punci',
'only_matching': True,
}, {
'url': 'http://film.indavideo.hu/video/f_hrom_nagymamm_volt',
'only_matching': True,
}, {
'url': 'http://palyazat.indavideo.hu/video/Embertelen_dal_Dodgem_egyuttes',
'only_matching': True,
}]
def _real_extract(self, url): def _real_extract(self, url):
display_id = self._match_id(url) display_id = self._match_id(url)