diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/trilulilu.py | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dl/extractor/trilulilu.py index 220a05b7b..185accc4b 100644 --- a/youtube_dl/extractor/trilulilu.py +++ b/youtube_dl/extractor/trilulilu.py @@ -1,40 +1,55 @@ +# coding: utf-8 from __future__ import unicode_literals -import json +import re from .common import InfoExtractor +from ..utils import ExtractorError class TriluliluIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?trilulilu\.ro/video-[^/]+/(?P<id>[^/]+)' + _VALID_URL = r'https?://(?:www\.)?trilulilu\.ro/(?:video-[^/]+/)?(?P<id>[^/#\?]+)' _TEST = { 'url': 'http://www.trilulilu.ro/video-animatie/big-buck-bunny-1', + 'md5': 'c1450a00da251e2769b74b9005601cac', 'info_dict': { - 'id': 'big-buck-bunny-1', + 'id': 'ae2899e124140b', 'ext': 'mp4', 'title': 'Big Buck Bunny', 'description': ':) pentru copilul din noi', }, - # Server ignores Range headers (--test) - 'params': { - 'skip_download': True - } } def _real_extract(self, url): - video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) + display_id = self._match_id(url) + webpage = self._download_webpage(url, display_id) + + if re.search(r'Fişierul nu este disponibil pentru vizionare în ţara dumneavoastră', webpage): + raise ExtractorError( + 'This video is not available in your country.', expected=True) + elif re.search('Fişierul poate fi accesat doar de către prietenii lui', webpage): + raise ExtractorError('This video is private.', expected=True) + + flashvars_str = self._search_regex( + r'block_flash_vars\s*=\s*(\{[^\}]+\})', webpage, 'flashvars', fatal=False, default=None) + if flashvars_str: + flashvars = self._parse_json(flashvars_str, display_id) + else: + raise ExtractorError( + 'This page does not contain videos', expected=True) + + if flashvars['isMP3'] == 'true': + raise ExtractorError( + 'Audio downloads are currently not supported', expected=True) + + video_id = flashvars['hash'] title = self._og_search_title(webpage) thumbnail = self._og_search_thumbnail(webpage) - description = self._og_search_description(webpage) - - log_str = self._search_regex( - r'block_flash_vars[ ]=[ ]({[^}]+})', webpage, 'log info') - log = json.loads(log_str) + description = self._og_search_description(webpage, default=None) format_url = ('http://fs%(server)s.trilulilu.ro/%(hash)s/' - 'video-formats2' % log) + 'video-formats2' % flashvars) format_doc = self._download_xml( format_url, video_id, note='Downloading formats', @@ -44,10 +59,10 @@ class TriluliluIE(InfoExtractor): 'http://fs%(server)s.trilulilu.ro/stream.php?type=video' '&source=site&hash=%(hash)s&username=%(userid)s&' 'key=ministhebest&format=%%s&sig=&exp=' % - log) + flashvars) formats = [ { - 'format': fnode.text, + 'format_id': fnode.text.partition('-')[2], 'url': video_url_template % fnode.text, 'ext': fnode.text.partition('-')[0] } @@ -56,8 +71,8 @@ class TriluliluIE(InfoExtractor): ] return { - '_type': 'video', 'id': video_id, + 'display_id': display_id, 'formats': formats, 'title': title, 'description': description, |