Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-01-26 14:52:51 +08:00
Code Issues Releases Wiki Activity

[BlenderCloud] Removed redundant methods

Browse Source
This commit is contained in:
Parmjit Virk 2017-07-08 16:56:49 -05:00
parent a7a3bf1fbc
commit 2e0eb369f5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/blendercloud.py
View File

@ -26,12 +26,6 @@ class BlenderCloudBaseIE(InfoExtractor):
r'<div\s*id=\"node-title\"\s*class=\"node-title\">(.*?)</div>', source, 'title').strip() r'<div\s*id=\"node-title\"\s*class=\"node-title\">(.*?)</div>', source, 'title').strip()
return node_title return node_title
def get_webpage_title(self, source):
webpage_title = None
webpage_title = self._html_search_regex(
r'<title>(.*?)</title>', source, 'title').strip()
return webpage_title
@staticmethod @staticmethod
def is_video_subscriber_only(source): def is_video_subscriber_only(source):
errmsg_subscribers_only = 'Only available to Blender Cloud subscribers.' errmsg_subscribers_only = 'Only available to Blender Cloud subscribers.'
@ -272,6 +266,7 @@ class BlenderCloudPlaylistIE(BlenderCloudBaseIE):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
display_id = mobj.group('display_id') display_id = mobj.group('display_id')
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
webpage_title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title').strip() or None
entries = [] entries = []
for node_id in re.findall(r'data-node_id=\"([0-9a-z]+)\"\s*class=\"', webpage): for node_id in re.findall(r'data-node_id=\"([0-9a-z]+)\"\s*class=\"', webpage):
@ -311,4 +306,4 @@ class BlenderCloudPlaylistIE(BlenderCloudBaseIE):
self.report_warning('%s - %s' % (sub_node_id, self.warning_no_video_sources)) self.report_warning('%s - %s' % (sub_node_id, self.warning_no_video_sources))
else: else:
self.report_warning('%s - %s' % (node_id, self.warning_no_video_sources)) self.report_warning('%s - %s' % (node_id, self.warning_no_video_sources))
return self.playlist_result(entries, playlist_id=display_id, playlist_title=self.get_webpage_title(webpage)) return self.playlist_result(entries, playlist_id=display_id, playlist_title=webpage_title)