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

Merge pull request #52 from ytdl-org/master

Browse Source 
[pull] master from ytdl-org:master
This commit is contained in:
pull[bot] 2019-07-30 19:19:02 +00:00 committed by GitHub
commit aa5736cc7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/dlive.py
View File

@ -9,8 +9,8 @@ from ..utils import int_or_none
class DLiveVODIE(InfoExtractor): class DLiveVODIE(InfoExtractor):
IE_NAME = 'dlive:vod' IE_NAME = 'dlive:vod'
_VALID_URL = r'https?://(?:www\.)?dlive\.tv/p/(?P<uploader_id>.+?)\+(?P<id>[a-zA-Z0-9]+)' _VALID_URL = r'https?://(?:www\.)?dlive\.tv/p/(?P<uploader_id>.+?)\+(?P<id>[^/?#&]+)'
_TEST = { _TESTS = [{
'url': 'https://dlive.tv/p/pdp+3mTzOl4WR', 'url': 'https://dlive.tv/p/pdp+3mTzOl4WR',
'info_dict': { 'info_dict': {
'id': '3mTzOl4WR', 'id': '3mTzOl4WR',
@ -20,7 +20,10 @@ class DLiveVODIE(InfoExtractor):
'timestamp': 1562011015, 'timestamp': 1562011015,
'uploader_id': 'pdp', 'uploader_id': 'pdp',
} }
} }, {
'url': 'https://dlive.tv/p/pdpreplay+D-RD-xSZg',
'only_matching': True,
}]
def _real_extract(self, url): def _real_extract(self, url):
uploader_id, vod_id = re.match(self._VALID_URL, url).groups() uploader_id, vod_id = re.match(self._VALID_URL, url).groups()

5
youtube_dl/extractor/openload.py
View File

@ -243,7 +243,7 @@ class PhantomJSwrapper(object):
class OpenloadIE(InfoExtractor): class OpenloadIE(InfoExtractor):
_DOMAINS = r'(?:openload\.(?:co|io|link|pw)|oload\.(?:tv|biz|stream|site|xyz|win|download|cloud|cc|icu|fun|club|info|press|pw|life|live|space|services|website)|oladblock\.(?:services|xyz|me)|openloed\.co)' _DOMAINS = r'(?:openload\.(?:co|io|link|pw)|oload\.(?:tv|best|biz|stream|site|xyz|win|download|cloud|cc|icu|fun|club|info|press|pw|life|live|space|services|website)|oladblock\.(?:services|xyz|me)|openloed\.co)'
_VALID_URL = r'''(?x) _VALID_URL = r'''(?x)
https?:// https?://
(?P<host> (?P<host>
@ -368,6 +368,9 @@ class OpenloadIE(InfoExtractor):
}, { }, {
'url': 'https://oload.biz/f/bEk3Gp8ARr4/', 'url': 'https://oload.biz/f/bEk3Gp8ARr4/',
'only_matching': True, 'only_matching': True,
}, {
'url': 'https://oload.best/embed/kkz9JgVZeWc/',
'only_matching': True,
}, { }, {
'url': 'https://oladblock.services/f/b8NWEgkqNLI/', 'url': 'https://oladblock.services/f/b8NWEgkqNLI/',
'only_matching': True, 'only_matching': True,