projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mailru] Fix extraction (closes #24530) (#25239)
[youtube-dl]
/
youtube_dl
/
extractor
/
dlive.py
diff --git
a/youtube_dl/extractor/dlive.py
b/youtube_dl/extractor/dlive.py
index b81eaecce2f3bcd237241a274dc45a5ddf027223..d95c67a5be529c05b723011017561aee21a3927c 100644
(file)
--- a/
youtube_dl/extractor/dlive.py
+++ b/
youtube_dl/extractor/dlive.py
@@
-9,8
+9,8
@@
from ..utils import int_or_none
class DLiveVODIE(InfoExtractor):
IE_NAME = 'dlive:vod'
class DLiveVODIE(InfoExtractor):
IE_NAME = 'dlive:vod'
- _VALID_URL = r'https?://(?:www\.)?dlive\.tv/p/(?P<uploader_id>.+?)\+(?P<id>[
a-zA-Z0-9
]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:www\.)?dlive\.tv/p/(?P<uploader_id>.+?)\+(?P<id>[
^/?#&
]+)'
+ _TEST
S = [
{
'url': 'https://dlive.tv/p/pdp+3mTzOl4WR',
'info_dict': {
'id': '3mTzOl4WR',
'url': 'https://dlive.tv/p/pdp+3mTzOl4WR',
'info_dict': {
'id': '3mTzOl4WR',
@@
-20,7
+20,10
@@
class DLiveVODIE(InfoExtractor):
'timestamp': 1562011015,
'uploader_id': 'pdp',
}
'timestamp': 1562011015,
'uploader_id': 'pdp',
}
- }
+ }, {
+ 'url': 'https://dlive.tv/p/pdpreplay+D-RD-xSZg',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
uploader_id, vod_id = re.match(self._VALID_URL, url).groups()
def _real_extract(self, url):
uploader_id, vod_id = re.match(self._VALID_URL, url).groups()
@@
-55,7
+58,7
@@
class DLiveVODIE(InfoExtractor):
class DLiveStreamIE(InfoExtractor):
IE_NAME = 'dlive:stream'
class DLiveStreamIE(InfoExtractor):
IE_NAME = 'dlive:stream'
- _VALID_URL = r'https?://(?:www\.)?dlive\.tv/(?P<id>[\w.-]+)'
+ _VALID_URL = r'https?://(?:www\.)?dlive\.tv/(?
!p/)(?
P<id>[\w.-]+)'
def _real_extract(self, url):
display_name = self._match_id(url)
def _real_extract(self, url):
display_name = self._match_id(url)