diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-08-13 23:40:20 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-08-13 23:40:20 +0600 |
| commit | a34e19629c407a08cd9065223f26f1f5468a4423 (patch) | |
| tree | f01f33ec1bcb816a47cb9d512dc2a18026a7914e /youtube_dl/extractor/indavideo.py | |
| parent | 3c12a027d48a2d6d1162ab515df0308237aef881 (diff) | |
| download | youtube-dl-a34e19629c407a08cd9065223f26f1f5468a4423.tar.xz | |
[indavideo] Relax _VALID_URL to match subdomains and add tests
Diffstat (limited to 'youtube_dl/extractor/indavideo.py')
| -rw-r--r-- | youtube_dl/extractor/indavideo.py | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/youtube_dl/extractor/indavideo.py b/youtube_dl/extractor/indavideo.py index b75715244..550a7001b 100644 --- a/youtube_dl/extractor/indavideo.py +++ b/youtube_dl/extractor/indavideo.py @@ -44,7 +44,6 @@ class IndavideoEmbedIE(InfoExtractor): 'http://amfphp.indavideo.hu/SYm0json.php/player.playerHandler.getVideoData/%s' % video_id, video_id)['data'] - video_id = video['id'] title = video['title'] video_urls = video.get('video_files', []) @@ -78,7 +77,7 @@ class IndavideoEmbedIE(InfoExtractor): tags = [tag['title'] for tag in video.get('tags', [])] return { - 'id': video_id, + 'id': video.get('id') or video_id, 'title': title, 'description': video.get('description'), 'thumbnails': thumbnails, @@ -93,8 +92,8 @@ class IndavideoEmbedIE(InfoExtractor): class IndavideoIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?indavideo\.hu/video/(?P<id>[^/#?]+)' - _TEST = { + _VALID_URL = r'https?://(?:.+?\.)?indavideo\.hu/video/(?P<id>[^/#?]+)' + _TESTS = [{ 'url': 'http://indavideo.hu/video/Vicces_cica_1', 'md5': '8c82244ba85d2a2310275b318eb51eac', 'info_dict': { @@ -112,7 +111,22 @@ class IndavideoIE(InfoExtractor): 'age_limit': 0, '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): display_id = self._match_id(url) |