X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvk.py;h=9d6ec43821405363d23e4831ddf59365ead4c7d1;hb=d16abf434aa22ee20aefd26491894d4600c48af0;hp=daf615af991fc6503ce22691716e545e126c4443;hpb=9262867e86cb415ed1994f9f956536eba39fc457;p=youtube-dl diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index daf615af9..9d6ec4382 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -74,21 +74,6 @@ class VKIE(InfoExtractor): }, 'skip': 'Requires vk account credentials', }, - { - # VIDEO NOW REMOVED - # please update if you find a video whose URL follows the same pattern - 'url': 'http://vk.com/feed?z=video-43215063_166094326%2Fbb50cacd3177146d7a', - 'md5': 'd82c22e449f036282d1d3f7f4d276869', - 'info_dict': { - 'id': '166094326', - 'ext': 'mp4', - 'uploader': 'Киномания - лучшее из мира кино', - 'title': 'Запах женщины (1992)', - 'duration': 9392, - 'upload_date': '20130914' - }, - 'skip': 'Requires vk account credentials', - }, { 'url': 'http://vk.com/hd_kino_mania?z=video-43215063_168067957%2F15c66b9b533119788d', 'md5': '4d7a5ef8cf114dfa09577e57b2993202', @@ -115,6 +100,11 @@ class VKIE(InfoExtractor): }, 'skip': 'Only works from Russia', }, + { + # removed video, just testing that we match the pattern + 'url': 'http://vk.com/feed?z=video-43215063_166094326%2Fbb50cacd3177146d7a', + 'only_matching': True, + }, ] def _login(self): @@ -220,7 +210,10 @@ class VKUserVideosIE(InfoExtractor): def _real_extract(self, url): page_id = self._match_id(url) page = self._download_webpage(url, page_id) - video_ids = orderedSet(m.group(1) for m in re.finditer(r'href="/video([0-9_]+)"', page)) - url_entries = [self.url_result('http://vk.com/video' + video_id, 'VK', video_id=video_id) - for video_id in video_ids] + video_ids = orderedSet( + m.group(1) for m in re.finditer(r'href="/video([0-9_]+)"', page)) + url_entries = [ + self.url_result( + 'http://vk.com/video' + video_id, 'VK', video_id=video_id) + for video_id in video_ids] return self.playlist_result(url_entries, page_id)