X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftwentyfourvideo.py;h=e03e2dbaa42f23a5107a50c67e7c12d9f378600b;hb=9f0ee2a3883ec6f6fdccba90085cb925aaa2f617;hp=67e8bfea03476ccf78d2470a973655f2a7213730;hpb=ac5633592afa9d70c05170333a0fb9013ba868da;p=youtube-dl diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dl/extractor/twentyfourvideo.py index 67e8bfea0..e03e2dbaa 100644 --- a/youtube_dl/extractor/twentyfourvideo.py +++ b/youtube_dl/extractor/twentyfourvideo.py @@ -5,6 +5,8 @@ from .common import InfoExtractor from ..utils import ( parse_iso8601, int_or_none, + xpath_attr, + xpath_element, ) @@ -15,7 +17,7 @@ class TwentyFourVideoIE(InfoExtractor): _TESTS = [ { 'url': 'http://www.24video.net/video/view/1044982', - 'md5': '48dd7646775690a80447a8dca6a2df76', + 'md5': 'e09fc0901d9eaeedac872f154931deeb', 'info_dict': { 'id': '1044982', 'ext': 'mp4', @@ -54,7 +56,7 @@ class TwentyFourVideoIE(InfoExtractor): webpage, 'upload date')) uploader = self._html_search_regex( - r'ÐагÑÑзил\s*([^<]+)', + r'class="video-uploaded"[^>]*>\s*]*>([^<]+)', webpage, 'uploader', fatal=False) view_count = int_or_none(self._html_search_regex( @@ -64,33 +66,24 @@ class TwentyFourVideoIE(InfoExtractor): r'