diff options
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/videopremium.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/youtube_dl/extractor/videopremium.py b/youtube_dl/extractor/videopremium.py index 9f2cdb6ef..3176e3b9d 100644 --- a/youtube_dl/extractor/videopremium.py +++ b/youtube_dl/extractor/videopremium.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re import random @@ -5,23 +7,22 @@ from .common import InfoExtractor class VideoPremiumIE(InfoExtractor): - _VALID_URL = r'(?:https?://)?(?:www\.)?videopremium\.(?:tv|me)/(?P<id>\w+)(?:/.*)?' + _VALID_URL = r'https?://(?:www\.)?videopremium\.(?:tv|me)/(?P<id>\w+)(?:/.*)?' _TEST = { - u'url': u'http://videopremium.tv/4w7oadjsf156', - u'file': u'4w7oadjsf156.f4v', - u'info_dict': { - u"title": u"youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4" + 'url': 'http://videopremium.tv/4w7oadjsf156', + 'info_dict': { + 'id': '4w7oadjsf156', + 'ext': 'f4v', + 'title': 'youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4' }, - u'params': { - u'skip_download': True, + 'params': { + 'skip_download': True, }, - u'skip': u'Test file has been deleted.', + 'skip': 'Test file has been deleted.', } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - - video_id = mobj.group('id') + video_id = self._match_id(url) webpage_url = 'http://videopremium.tv/' + video_id webpage = self._download_webpage(webpage_url, video_id) @@ -29,10 +30,10 @@ class VideoPremiumIE(InfoExtractor): # Download again, we need a cookie webpage = self._download_webpage( webpage_url, video_id, - note=u'Downloading webpage again (with cookie)') + note='Downloading webpage again (with cookie)') video_title = self._html_search_regex( - r'<h2(?:.*?)>\s*(.+?)\s*<', webpage, u'video title') + r'<h2(?:.*?)>\s*(.+?)\s*<', webpage, 'video title') return { 'id': video_id, |