mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-22 10:11:52 +00:00
[videopremium] Modernize
This commit is contained in:
parent
5c32110114
commit
d3b5101a91
1 changed files with 14 additions and 13 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import random
|
import random
|
||||||
|
|
||||||
|
@ -5,23 +7,22 @@ from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class VideoPremiumIE(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 = {
|
_TEST = {
|
||||||
u'url': u'http://videopremium.tv/4w7oadjsf156',
|
'url': 'http://videopremium.tv/4w7oadjsf156',
|
||||||
u'file': u'4w7oadjsf156.f4v',
|
'info_dict': {
|
||||||
u'info_dict': {
|
'id': '4w7oadjsf156',
|
||||||
u"title": u"youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4"
|
'ext': 'f4v',
|
||||||
|
'title': 'youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4'
|
||||||
},
|
},
|
||||||
u'params': {
|
'params': {
|
||||||
u'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
u'skip': u'Test file has been deleted.',
|
'skip': 'Test file has been deleted.',
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
video_id = self._match_id(url)
|
||||||
|
|
||||||
video_id = mobj.group('id')
|
|
||||||
webpage_url = 'http://videopremium.tv/' + video_id
|
webpage_url = 'http://videopremium.tv/' + video_id
|
||||||
webpage = self._download_webpage(webpage_url, video_id)
|
webpage = self._download_webpage(webpage_url, video_id)
|
||||||
|
|
||||||
|
@ -29,10 +30,10 @@ class VideoPremiumIE(InfoExtractor):
|
||||||
# Download again, we need a cookie
|
# Download again, we need a cookie
|
||||||
webpage = self._download_webpage(
|
webpage = self._download_webpage(
|
||||||
webpage_url, video_id,
|
webpage_url, video_id,
|
||||||
note=u'Downloading webpage again (with cookie)')
|
note='Downloading webpage again (with cookie)')
|
||||||
|
|
||||||
video_title = self._html_search_regex(
|
video_title = self._html_search_regex(
|
||||||
r'<h2(?:.*?)>\s*(.+?)\s*<', webpage, u'video title')
|
r'<h2(?:.*?)>\s*(.+?)\s*<', webpage, 'video title')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
Loading…
Reference in a new issue