X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/c512650955de0b16d37e7fa7fb29ea0985e415bb..72d91f91be4810269f74cf296cab5dd61b84129c:/youtube_dl/extractor/videott.py diff --git a/youtube_dl/extractor/videott.py b/youtube_dl/extractor/videott.py index b5034b0..ececc7e 100644 --- a/youtube_dl/extractor/videott.py +++ b/youtube_dl/extractor/videott.py @@ -4,15 +4,18 @@ import re import base64 from .common import InfoExtractor -from ..utils import unified_strdate +from ..utils import ( + unified_strdate, + int_or_none, +) class VideoTtIE(InfoExtractor): ID_NAME = 'video.tt' IE_DESC = 'video.tt - Your True Tube' - _VALID_URL = r'http://(?:www\.)?video\.tt/(?:video/|watch_video\.php\?v=)(?P[\da-zA-Z]{9})' + _VALID_URL = r'http://(?:www\.)?video\.tt/(?:(?:video|embed)/|watch_video\.php\?v=)(?P[\da-zA-Z]{9})' - _TEST = { + _TESTS = [{ 'url': 'http://www.video.tt/watch_video.php?v=amd5YujV8', 'md5': 'b13aa9e2f267effb5d1094443dff65ba', 'info_dict': { @@ -23,7 +26,10 @@ class VideoTtIE(InfoExtractor): 'upload_date': '20130827', 'uploader': 'joseph313', } - } + }, { + 'url': 'http://video.tt/embed/amd5YujV8', + 'only_matching': True, + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -50,9 +56,9 @@ class VideoTtIE(InfoExtractor): 'thumbnail': settings['config']['thumbnail'], 'upload_date': unified_strdate(video['added']), 'uploader': video['owner'], - 'view_count': int(video['view_count']), - 'comment_count': int(video['comment_count']), - 'like_count': int(video['liked']), - 'dislike_count': int(video['disliked']), + 'view_count': int_or_none(video['view_count']), + 'comment_count': None if video.get('comment_count') == '--' else int_or_none(video['comment_count']), + 'like_count': int_or_none(video['liked']), + 'dislike_count': int_or_none(video['disliked']), 'formats': formats, - } \ No newline at end of file + }