From c7095dada3fdd2fabaa535cc176b7d4a2ae5726d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 4 Mar 2014 19:22:48 +0700 Subject: [PATCH] [tvigle] Add support for another video link format --- youtube_dl/extractor/tvigle.py | 37 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dl/extractor/tvigle.py index 08103f665..0921cc5f8 100644 --- a/youtube_dl/extractor/tvigle.py +++ b/youtube_dl/extractor/tvigle.py @@ -14,19 +14,32 @@ class TvigleIE(InfoExtractor): IE_NAME = 'tvigle' IE_DESC = 'Интернет-телевидение Tvigle.ru' - _VALID_URL = r'http://(?:www\.)?tvigle\.ru/category/.+?video=(?P\d+)' + _VALID_URL = r'http://(?:www\.)?tvigle\.ru/category/.+?[\?&]v(?:ideo)?=(?P\d+)' - _TEST = { - 'url': 'http://www.tvigle.ru/category/cinema/1608/?video=503081', - 'md5': '09afba4616666249f087efc6dcf83cb3', - 'info_dict': { - 'id': '503081', - 'ext': 'flv', - 'title': 'Брат 2 ', - 'description': 'md5:f5a42970f50648cee3d7ad740f3ae769', - 'upload_date': '20110919', - } - } + _TESTS = [ + { + 'url': 'http://www.tvigle.ru/category/cinema/1608/?video=503081', + 'md5': '09afba4616666249f087efc6dcf83cb3', + 'info_dict': { + 'id': '503081', + 'ext': 'flv', + 'title': 'Брат 2 ', + 'description': 'md5:f5a42970f50648cee3d7ad740f3ae769', + 'upload_date': '20110919', + }, + }, + { + 'url': 'http://www.tvigle.ru/category/men/vysotskiy_vospominaniya02/?flt=196&v=676433', + 'md5': 'e7efe5350dd5011d0de6550b53c3ba7b', + 'info_dict': { + 'id': '676433', + 'ext': 'flv', + 'title': 'Ведущий телепрограммы «60 минут» (США) о Владимире Высоцком', + 'description': 'md5:027f7dc872948f14c96d19b4178428a4', + 'upload_date': '20121218', + }, + }, + ] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url)