projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve some _VALID_URLs
[youtube-dl]
/
youtube_dl
/
extractor
/
imdb.py
diff --git
a/youtube_dl/extractor/imdb.py
b/youtube_dl/extractor/imdb.py
index 3a2b7cec5cebb0d0bc06aec0d93400c4987adc8d..f0fc8d49a4ad50c128d124534fc37141cb510ba6 100644
(file)
--- a/
youtube_dl/extractor/imdb.py
+++ b/
youtube_dl/extractor/imdb.py
@@
-6,25
+6,32
@@
from .common import InfoExtractor
from ..utils import (
mimetype2ext,
qualities,
from ..utils import (
mimetype2ext,
qualities,
+ remove_end,
)
class ImdbIE(InfoExtractor):
IE_NAME = 'imdb'
IE_DESC = 'Internet Movie Database trailers'
)
class ImdbIE(InfoExtractor):
IE_NAME = 'imdb'
IE_DESC = 'Internet Movie Database trailers'
- _VALID_URL = r'https?://(?:www|m)\.imdb\.com/
video/[^/]+/
vi(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:www|m)\.imdb\.com/
(?:video/[^/]+/|title/tt\d+.*?#lb-)
vi(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.imdb.com/video/imdb/vi2524815897',
'info_dict': {
'id': '2524815897',
'ext': 'mp4',
_TESTS = [{
'url': 'http://www.imdb.com/video/imdb/vi2524815897',
'info_dict': {
'id': '2524815897',
'ext': 'mp4',
- 'title': 'Ice Age: Continental Drift Trailer (No. 2)
- IMDb
',
+ 'title': 'Ice Age: Continental Drift Trailer (No. 2)',
'description': 'md5:9061c2219254e5d14e03c25c98e96a81',
}
}, {
'url': 'http://www.imdb.com/video/_/vi2524815897',
'only_matching': True,
'description': 'md5:9061c2219254e5d14e03c25c98e96a81',
}
}, {
'url': 'http://www.imdb.com/video/_/vi2524815897',
'only_matching': True,
+ }, {
+ 'url': 'http://www.imdb.com/title/tt1667889/?ref_=ext_shr_eml_vi#lb-vi2524815897',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.imdb.com/title/tt1667889/#lb-vi2524815897',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-77,17
+84,17
@@
class ImdbIE(InfoExtractor):
return {
'id': video_id,
return {
'id': video_id,
- 'title':
self._og_search_title(webpage
),
+ 'title':
remove_end(self._og_search_title(webpage), ' - IMDb'
),
'formats': formats,
'description': descr,
'formats': formats,
'description': descr,
- 'thumbnail': format_info
['slate']
,
+ 'thumbnail': format_info
.get('slate')
,
}
class ImdbListIE(InfoExtractor):
IE_NAME = 'imdb:list'
IE_DESC = 'Internet Movie Database lists'
}
class ImdbListIE(InfoExtractor):
IE_NAME = 'imdb:list'
IE_DESC = 'Internet Movie Database lists'
- _VALID_URL = r'https?://
www\.
imdb\.com/list/(?P<id>[\da-zA-Z_-]{11})'
+ _VALID_URL = r'https?://
(?:www\.)?
imdb\.com/list/(?P<id>[\da-zA-Z_-]{11})'
_TEST = {
'url': 'http://www.imdb.com/list/JFs9NWw6XI0',
'info_dict': {
_TEST = {
'url': 'http://www.imdb.com/list/JFs9NWw6XI0',
'info_dict': {