projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Add id and title helpers for generic IEs
[youtube-dl]
/
youtube_dl
/
extractor
/
indavideo.py
diff --git
a/youtube_dl/extractor/indavideo.py
b/youtube_dl/extractor/indavideo.py
index 12fb5e8e1dcb1e5dfba8057a1496edcbe0f61f82..c6f080484a99f43614f104ead8023e8e57609cda 100644
(file)
--- a/
youtube_dl/extractor/indavideo.py
+++ b/
youtube_dl/extractor/indavideo.py
@@
-60,7
+60,8
@@
class IndavideoEmbedIE(InfoExtractor):
formats = [{
'url': video_url,
formats = [{
'url': video_url,
- 'height': self._search_regex(r'\.(\d{3,4})\.mp4$', video_url, 'height', default=None),
+ 'height': int_or_none(self._search_regex(
+ r'\.(\d{3,4})\.mp4(?:\?|$)', video_url, 'height', default=None)),
} for video_url in video_urls]
self._sort_formats(formats)
} for video_url in video_urls]
self._sort_formats(formats)
@@
-73,7
+74,7
@@
class IndavideoEmbedIE(InfoExtractor):
'url': self._proto_relative_url(thumbnail)
} for thumbnail in video.get('thumbnails', [])]
'url': self._proto_relative_url(thumbnail)
} for thumbnail in video.get('thumbnails', [])]
- tags = [tag['title'] for tag in video.get('tags'
, [])
]
+ tags = [tag['title'] for tag in video.get('tags'
) or []
]
return {
'id': video.get('id') or video_id,
return {
'id': video.get('id') or video_id,