projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[comedycentral] Use unicode_literals
[youtube-dl]
/
youtube_dl
/
extractor
/
yahoo.py
diff --git
a/youtube_dl/extractor/yahoo.py
b/youtube_dl/extractor/yahoo.py
index e457c4707a8feda7c3d0709c18671282b6da3814..e17a39782bd2e674855dff8a5ec3112bd40158c6 100644
(file)
--- a/
youtube_dl/extractor/yahoo.py
+++ b/
youtube_dl/extractor/yahoo.py
@@
-6,8
+6,8
@@
from .common import InfoExtractor, SearchInfoExtractor
from ..utils import (
compat_urllib_parse,
compat_urlparse,
from ..utils import (
compat_urllib_parse,
compat_urlparse,
- determine_ext,
clean_html,
clean_html,
+ int_or_none,
)
)
@@
-47,7
+47,7
@@
class YahooIE(InfoExtractor):
# The 'meta' field is not always in the video webpage, we request it
# from another page
long_id = info['id']
# The 'meta' field is not always in the video webpage, we request it
# from another page
long_id = info['id']
- return self._get_info(
info['id']
, video_id)
+ return self._get_info(
long_id
, video_id)
def _get_info(self, long_id, video_id):
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
def _get_info(self, long_id, video_id):
query = ('SELECT * FROM yahoo.media.video.streams WHERE id="%s"'
@@
-68,9
+68,9
@@
class YahooIE(InfoExtractor):
formats = []
for s in info['streams']:
format_info = {
formats = []
for s in info['streams']:
format_info = {
- 'width':
s.get('width'
),
- 'height':
s.get('height'
),
- '
bitrate': s.get('bitrate'
),
+ 'width':
int_or_none(s.get('width')
),
+ 'height':
int_or_none(s.get('height')
),
+ '
tbr': int_or_none(s.get('bitrate')
),
}
host = s['host']
}
host = s['host']
@@
-84,10
+84,10
@@
class YahooIE(InfoExtractor):
else:
format_url = compat_urlparse.urljoin(host, path)
format_info['url'] = format_url
else:
format_url = compat_urlparse.urljoin(host, path)
format_info['url'] = format_url
- format_info['ext'] = determine_ext(format_url)
formats.append(format_info)
formats.append(format_info)
- formats = sorted(formats, key=lambda f:(f['height'], f['width']))
+
+ self._sort_formats(formats)
return {
'id': video_id,
return {
'id': video_id,