R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vtm] Address feedback except for the only_matching comment

Browse Source
This commit is contained in:
mrBliss 2017-03-13 16:55:32 +01:00
parent 418866d78b
commit 4c163143c3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/vtm.py
View File

@ -64,6 +64,9 @@ class VTMIE(InfoExtractor):
}, },
] ]
def _real_initialize(self):
self._logged_in = False
def _login(self): def _login(self):
(username, password) = self._get_login_info() (username, password) = self._get_login_info()
if username is None or password is None: if username is None or password is None:
@ -91,23 +94,26 @@ class VTMIE(InfoExtractor):
self._uid_signature = auth_info['UIDSignature'] self._uid_signature = auth_info['UIDSignature']
self._signature_timestamp = auth_info['signatureTimestamp'] self._signature_timestamp = auth_info['signatureTimestamp']
self._logged_in = True
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
site_id = mobj.group('site_id') site_id = mobj.group('site_id')
webpage = self._download_webpage(url, None) webpage = self._download_webpage(url, None, "Downloading webpage")
# The URL sometimes contains the video id, but not always, e.g., test # The URL sometimes contains the video id, but not always, e.g., test
# case 3. Fortunately, all webpages contain the video id. # case 3. Fortunately, all webpages of videos requiring authentication
# contain the video id.
video_id = self._search_regex( video_id = self._search_regex(
r'\\"vodId\\":\\"(.+?)\\"', webpage, 'video_id', default=None) r'\\"vodId\\":\\"(.+?)\\"', webpage, 'video_id', default=None)
# When no video_id is found, it was most likely a video not requiring # It was most likely a video not requiring authentication.
# authentication, so just fall back to the generic extractor
if not video_id: if not video_id:
return self.url_result(url, 'Generic') return self.url_result(url, 'Generic')
self._login() if not self._logged_in:
self._login()
title = self._html_search_regex( title = self._html_search_regex(
r'\\"title\\":\\"(.+?)\\"', webpage, 'title', default=None) r'\\"title\\":\\"(.+?)\\"', webpage, 'title', default=None)