pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-16 18:42:38 +09:00
Code Issues Projects Releases Wiki Activity

[spiegel] Use centralized sorting

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-12-24 12:40:23 +01:00
parent 719d3927d7
commit e6812ac99d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/extractor/common.py
View File

@ -438,6 +438,11 @@ class InfoExtractor(object):
def _sort_formats(self, formats): def _sort_formats(self, formats):
def _formats_key(f): def _formats_key(f):
# TODO remove the following workaround
from ..utils import determine_ext
if not f.get('ext') and 'url' in f:
f['ext'] = determine_ext(f['url'])
preference = f.get('preference') preference = f.get('preference')
if preference is None: if preference is None:
preference = 0 if f.get('url', '').startswith('http') else -0.1 preference = 0 if f.get('url', '').startswith('http') else -0.1

3
youtube_dl/extractor/spiegel.py
View File

@ -51,9 +51,10 @@ class SpiegelIE(InfoExtractor):
# Blacklist type 6, it's extremely LQ and not available on the same server # Blacklist type 6, it's extremely LQ and not available on the same server
if n.tag.startswith('type') and n.tag != 'type6' if n.tag.startswith('type') and n.tag != 'type6'
] ]
formats.sort(key=lambda f: f['vbr'])
duration = float(idoc[0].findall('./duration')[0].text) duration = float(idoc[0].findall('./duration')[0].text)
self._sort_formats(formats)
info = { info = {
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,