projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[weibo] Remove the extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
openload.py
diff --git
a/youtube_dl/extractor/openload.py
b/youtube_dl/extractor/openload.py
index 9704f2e9ddc3ac2c496bcedec2519b70a18cd55e..6415b8fdcb7451e6b499d1d4d3515af2775c66c2 100644
(file)
--- a/
youtube_dl/extractor/openload.py
+++ b/
youtube_dl/extractor/openload.py
@@
-14,7
+14,7
@@
from ..utils import (
class OpenloadIE(InfoExtractor):
class OpenloadIE(InfoExtractor):
- _VALID_URL = r'https://openload.(?:co|io)/(?:f|embed)/(?P<id>[a-zA-Z0-9-]+)'
+ _VALID_URL = r'https://openload.(?:co|io)/(?:f|embed)/(?P<id>[a-zA-Z0-9-
_
]+)'
_TESTS = [{
'url': 'https://openload.co/f/kUEfGclsU9o',
_TESTS = [{
'url': 'https://openload.co/f/kUEfGclsU9o',
@@
-31,6
+31,9
@@
class OpenloadIE(InfoExtractor):
}, {
'url': 'https://openload.io/f/ZAn6oz-VZGE/',
'only_matching': True,
}, {
'url': 'https://openload.io/f/ZAn6oz-VZGE/',
'only_matching': True,
+ }, {
+ 'url': 'https://openload.co/f/_-ztPaZtMhM/',
+ 'only_matching': True,
}, {
# unavailable via https://openload.co/f/Sxz5sADo82g/, different layout
# for title and ext
}, {
# unavailable via https://openload.co/f/Sxz5sADo82g/, different layout
# for title and ext
@@
-100,7
+103,7
@@
class OpenloadIE(InfoExtractor):
raise ExtractorError('File not found', expected=True)
code = self._search_regex(
raise ExtractorError('File not found', expected=True)
code = self._search_regex(
- r'<
video[^>]+
>\s*<script[^>]+>([^<]+)</script>',
+ r'<
/video>\s*</div>\s*<script[^>]+>[^>]+</script
>\s*<script[^>]+>([^<]+)</script>',
webpage, 'JS code')
decoded = self.openload_decode(code)
webpage, 'JS code')
decoded = self.openload_decode(code)
@@
-122,6
+125,6
@@
class OpenloadIE(InfoExtractor):
'id': video_id,
'title': title,
'ext': ext,
'id': video_id,
'title': title,
'ext': ext,
- 'thumbnail': self._og_search_thumbnail(webpage),
+ 'thumbnail': self._og_search_thumbnail(webpage
, default=None
),
'url': video_url,
}
'url': video_url,
}