Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-11 00:47:15 +08:00
Code Issues Releases Wiki Activity

Merge pull request #239 from ytdl-org/master

Browse Source 
[pull] master from ytdl-org:master
This commit is contained in:
pull[bot] 2020-01-18 08:40:45 +00:00 committed by GitHub
commit a60642d301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/ivi.py
View File

@ -239,7 +239,7 @@ class IviCompilationIE(InfoExtractor):
self.url_result( self.url_result(
'http://www.ivi.ru/watch/%s/%s' % (compilation_id, serie), IviIE.ie_key()) 'http://www.ivi.ru/watch/%s/%s' % (compilation_id, serie), IviIE.ie_key())
for serie in re.findall( for serie in re.findall(
r'<a href="/watch/%s/(\d+)"[^>]+data-id="\1"' % compilation_id, html)] r'<a\b[^>]+\bhref=["\']/watch/%s/(\d+)["\']' % compilation_id, html)]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)

5
youtube_dl/extractor/twentyfourvideo.py
View File

@ -18,7 +18,7 @@ class TwentyFourVideoIE(InfoExtractor):
https?:// https?://
(?P<host> (?P<host>
(?:(?:www|porno)\.)?24video\. (?:(?:www|porno)\.)?24video\.
(?:net|me|xxx|sexy?|tube|adult|site) (?:net|me|xxx|sexy?|tube|adult|site|vip)
)/ )/
(?: (?:
video/(?:(?:view|xml)/)?| video/(?:(?:view|xml)/)?|
@ -59,6 +59,9 @@ class TwentyFourVideoIE(InfoExtractor):
}, { }, {
'url': 'https://porno.24video.net/video/2640421-vsya-takaya-gibkaya-i-v-masle', 'url': 'https://porno.24video.net/video/2640421-vsya-takaya-gibkaya-i-v-masle',
'only_matching': True, 'only_matching': True,
}, {
'url': 'https://www.24video.vip/video/view/1044982',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):