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

[verystream] use classmethod instead of staticmethod, don't capture domain

Browse Source
This commit is contained in:
Elliot Algase 2019-05-10 14:29:03 -04:00
parent b55cd2d07e
commit 2752cc932b
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/openload.py
View File

@ -1951,11 +1951,11 @@ class OpenloadIE(InfoExtractor):
'69.0.3497.28', '69.0.3497.28',
) )
@staticmethod @classmethod
def _extract_urls(webpage): def _extract_urls(cls, webpage):
return re.findall( return re.findall(
r'<iframe[^>]+src=["\']((?:https?://)?%s/embed/[a-zA-Z0-9-_]+)' r'<iframe[^>]+src=["\']((?:https?://)?%s/%s/[a-zA-Z0-9-_]+)'
% OpenloadIE._DOMAINS, webpage) % (cls._DOMAINS, cls._EMBED_WORD), webpage)
def _extract_decrypted_page(self, page_url, webpage, video_id, headers): def _extract_decrypted_page(self, page_url, webpage, video_id, headers):
phantom = PhantomJSwrapper(self, required_version='2.0') phantom = PhantomJSwrapper(self, required_version='2.0')
@ -2024,7 +2024,7 @@ class OpenloadIE(InfoExtractor):
class VerystreamIE(OpenloadIE): class VerystreamIE(OpenloadIE):
IE_NAME = 'verystream' IE_NAME = 'verystream'
_DOMAINS = r'(verystream\.com)' _DOMAINS = r'(?:verystream\.com)'
_VALID_URL = r'''(?x) _VALID_URL = r'''(?x)
https?:// https?://
(?P<host> (?P<host>
@ -2054,9 +2054,3 @@ class VerystreamIE(OpenloadIE):
def _extract_decrypted_page(self, page_url, webpage, video_id, headers): def _extract_decrypted_page(self, page_url, webpage, video_id, headers):
return webpage # for Verystream, the webpage is already decrypted return webpage # for Verystream, the webpage is already decrypted
@staticmethod
def _extract_urls(webpage):
return re.findall(
r'<iframe[^>]+src=["\']((?:https?://)?%s/e/[a-zA-Z0-9-_]+)'
% VerystreamIE._DOMAINS, webpage)