From: Sergey M. Date: Mon, 10 Feb 2014 14:07:41 +0000 (+0700) Subject: [lifenews] Minor improvements X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=bcb891e82b81e7da18b87628a0deb50308543606;p=youtube-dl [lifenews] Minor improvements --- diff --git a/youtube_dl/extractor/lifenews.py b/youtube_dl/extractor/lifenews.py index 051259857..7b7185f9a 100644 --- a/youtube_dl/extractor/lifenews.py +++ b/youtube_dl/extractor/lifenews.py @@ -4,19 +4,23 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import unified_strdate +from ..utils import ( + int_or_none, + unified_strdate +) class LifeNewsIE(InfoExtractor): IE_NAME = 'lifenews' IE_DESC = 'LIFE | NEWS' _VALID_URL = r'http://lifenews\.ru/(?:mobile/)?news/(?P\d+)' - + _TEST = { 'url': 'http://lifenews.ru/news/126342', - 'file': '126342.mp4', 'md5': 'e1b50a5c5fb98a6a544250f2e0db570a', 'info_dict': { + 'id': '126342', + 'ext': 'mp4', 'title': 'МВД разыскивает мужчин, оставивших в IKEA сумку с автоматом', 'description': 'Камеры наблюдения гипермаркета зафиксировали троих мужчин, спрятавших оружейный арсенал в камере хранения.', 'thumbnail': 'http://lifenews.ru/static/posts/2014/1/126342/.video.jpg', @@ -32,7 +36,7 @@ class LifeNewsIE(InfoExtractor): video_url = self._html_search_regex( r'', webpage, 'video URL') - + thumbnail = self._html_search_regex( r'', webpage, 'video thumbnail') @@ -44,12 +48,14 @@ class LifeNewsIE(InfoExtractor): description = self._og_search_description(webpage) view_count = self._html_search_regex( - r'
(\d+)
', webpage, 'view count') + r'
(\d+)
', webpage, 'view count', fatal=False) comment_count = self._html_search_regex( - r'
(\d+)
', webpage, 'comment count') + r'
(\d+)
', webpage, 'comment count', fatal=False) upload_date = self._html_search_regex( - r'