diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 3 | ||||
| -rw-r--r-- | youtube_dl/extractor/tvigle.py | 82 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 2 |
3 files changed, 45 insertions, 42 deletions
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 574a86390..afb34ce51 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -79,7 +79,8 @@ class FacebookIE(InfoExtractor): check_form = { 'fb_dtsg': self._search_regex(r'name="fb_dtsg" value="(.+?)"', login_results, 'fb_dtsg'), - 'h': self._search_regex(r'name="h" value="(\w*?)"', login_results, 'h'), + 'h': self._search_regex( + r'name="h"\s+(?:\w+="[^"]+"\s+)*?value="([^"]+)"', login_results, 'h'), 'name_action_selected': 'dont_save', } check_req = compat_urllib_request.Request(self._CHECKPOINT_URL, urlencode_postdata(check_form)) diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dl/extractor/tvigle.py index 0921cc5f8..dc8697850 100644 --- a/youtube_dl/extractor/tvigle.py +++ b/youtube_dl/extractor/tvigle.py @@ -5,80 +5,82 @@ import re from .common import InfoExtractor from ..utils import ( - unified_strdate, - clean_html, - int_or_none, + float_or_none, + str_to_int, ) class TvigleIE(InfoExtractor): IE_NAME = 'tvigle' IE_DESC = 'Интернет-телевидение Tvigle.ru' - _VALID_URL = r'http://(?:www\.)?tvigle\.ru/category/.+?[\?&]v(?:ideo)?=(?P<id>\d+)' + _VALID_URL = r'http://(?:www\.)?tvigle\.ru/(?:[^/]+/)+(?P<display_id>[^/]+)/$' _TESTS = [ { - 'url': 'http://www.tvigle.ru/category/cinema/1608/?video=503081', - 'md5': '09afba4616666249f087efc6dcf83cb3', + 'url': 'http://www.tvigle.ru/video/brat-2/', + 'md5': '72cb7eab33e54314e1790da402d3c9c3', 'info_dict': { - 'id': '503081', - 'ext': 'flv', + 'id': '5119390', + 'display_id': 'brat-2', + 'ext': 'mp4', 'title': 'Брат 2 ', - 'description': 'md5:f5a42970f50648cee3d7ad740f3ae769', - 'upload_date': '20110919', + 'description': 'md5:5751f4fe345a58e1692585c361294bd8', + 'duration': 7356.369, + 'age_limit': 0, }, }, { - 'url': 'http://www.tvigle.ru/category/men/vysotskiy_vospominaniya02/?flt=196&v=676433', - 'md5': 'e7efe5350dd5011d0de6550b53c3ba7b', + 'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/', + 'md5': 'd9012d7c7c598fe7a11d7fb46dc1f574', 'info_dict': { - 'id': '676433', - 'ext': 'flv', + 'id': '5142516', + 'ext': 'mp4', 'title': 'Ведущий телепрограммы «60 минут» (США) о Владимире Высоцком', 'description': 'md5:027f7dc872948f14c96d19b4178428a4', - 'upload_date': '20121218', + 'duration': 186.080, + 'age_limit': 0, }, }, ] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + display_id = mobj.group('display_id') - video_data = self._download_xml( - 'http://www.tvigle.ru/xml/single.php?obj=%s' % video_id, video_id, 'Downloading video XML') + webpage = self._download_webpage(url, display_id) - video = video_data.find('./video') + video_id = self._html_search_regex( + r'<li class="video-preview current_playing" id="(\d+)">', webpage, 'video id') - title = video.get('name') - description = video.get('anons') - if description: - description = clean_html(description) - thumbnail = video_data.get('img') - upload_date = unified_strdate(video.get('date')) - like_count = int_or_none(video.get('vtp')) + video_data = self._download_json( + 'http://cloud.tvigle.ru/api/play/video/%s/' % video_id, display_id) - formats = [] - for num, (format_id, format_note) in enumerate([['low_file', 'SQ'], ['file', 'HQ'], ['hd', 'HD 720']]): - video_url = video.get(format_id) - if not video_url: - continue - formats.append({ - 'url': video_url, - 'format_id': format_id, - 'format_note': format_note, - 'quality': num, - }) + item = video_data['playlist']['items'][0] + + title = item['title'] + description = item['description'] + thumbnail = item['thumbnail'] + duration = float_or_none(item['durationMilliseconds'], 1000) + age_limit = str_to_int(item['ageRestrictions']) + formats = [] + for vcodec, fmts in item['videos'].items(): + for quality, video_url in fmts.items(): + formats.append({ + 'url': video_url, + 'format_id': '%s-%s' % (vcodec, quality), + 'vcodec': vcodec, + 'height': int(quality[:-1]), + }) self._sort_formats(formats) return { 'id': video_id, + 'display_id': display_id, 'title': title, 'description': description, 'thumbnail': thumbnail, - 'upload_date': upload_date, - 'like_count': like_count, - 'age_limit': 18, + 'duration': duration, + 'age_limit': age_limit, 'formats': formats, }
\ No newline at end of file diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 6fe057234..91afe8622 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1321,7 +1321,7 @@ def str_to_int(int_str): """ A more relaxed version of int_or_none """ if int_str is None: return None - int_str = re.sub(r'[,\.]', u'', int_str) + int_str = re.sub(r'[,\.\+]', u'', int_str) return int(int_str) |