X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvice.py;h=01af7a99574401b38e487b01dd5104e674740bbc;hb=dc534b674f9dfbe869d23f6a64ea48f39bde6655;hp=e3ad4ef54fab43d0af44e847826a8b70f04e1991;hpb=772acaf31f4614d390a445fe4c0d4e533c165774;p=youtube-dl diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py index e3ad4ef54..01af7a995 100644 --- a/youtube_dl/extractor/vice.py +++ b/youtube_dl/extractor/vice.py @@ -1,5 +1,4 @@ from __future__ import unicode_literals -import re from .common import InfoExtractor from .ooyala import OoyalaIE @@ -7,7 +6,7 @@ from ..utils import ExtractorError class ViceIE(InfoExtractor): - _VALID_URL = r'https?://(?:.+?\.)?vice\.com/.*?/(?P.+)' + _VALID_URL = r'https?://(?:.+?\.)?vice\.com/(?:[^/]+/)+(?P.+)' _TESTS = [ { @@ -23,23 +22,13 @@ class ViceIE(InfoExtractor): }, }, { 'url': 'https://news.vice.com/video/experimenting-on-animals-inside-the-monkey-lab', - 'info_dict': { - 'id': 'N2bzkydjraWDGwnt8jAttCF6Y0PDv4Zj', - 'ext': 'mp4', - 'title': 'VICE News - Inside the Monkey Lab', - 'description': 'md5:1f660d467d3515f29d11e5ef742a4b82', - }, - 'params': { - # Requires ffmpeg (m3u8 manifest) - 'skip_download': True, - }, + 'only_matching': True, } ] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - name = mobj.group('name') - webpage = self._download_webpage(url, name) + video_id = self._match_id(url) + webpage = self._download_webpage(url, video_id) try: embed_code = self._search_regex( r'embedCode=([^&\'"]+)', webpage,