schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[zdf] Use centralized sorting

Browse source
This commit is contained in:
Philipp Hagemeister 2013-12-24 23:32:04 +01:00
parent e6812ac99d
commit c7deaa4c74
3 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
youtube_dl/extractor/zdf.py
View file

@ -67,29 +67,13 @@ class ZDFIE(InfoExtractor):
''', format_id)
ext = format_m.group('container')
is_supported = ext != 'f4f'
PROTO_ORDER = ['http', 'rtmp', 'rtsp']
try:
proto_pref = -PROTO_ORDER.index(format_m.group('proto'))
except ValueError:
proto_pref = -999
proto = format_m.group('proto')
quality = fnode.find('./quality').text
QUALITY_ORDER = ['veryhigh', '300', 'high', 'med', 'low']
try:
quality_pref = -QUALITY_ORDER.index(quality)
except ValueError:
quality_pref = -999
abr = int(fnode.find('./audioBitrate').text) // 1000
vbr = int(fnode.find('./videoBitrate').text) // 1000
pref = (is_available, is_supported,
proto_pref, quality_pref, vbr, abr)
format_note = u''
if not is_supported:
format_note += u'(unsupported)'
if not format_note:
format_note = None
@ -105,14 +89,16 @@ class ZDFIE(InfoExtractor):
'height': int(fnode.find('./height').text),
'filesize': int(fnode.find('./filesize').text),
'format_note': format_note,
'_pref': pref,
'protocol': format_m.group('proto').lower(),
'_available': is_available,
}
format_nodes = doc.findall('.//formitaeten/formitaet')
formats = sorted(filter(lambda f: f['_available'],
map(xml_to_format, format_nodes)),
key=operator.itemgetter('_pref'))
formats = list(filter(
lambda f: f['_available'],
map(xml_to_format, format_nodes)))
self._sort_formats(formats)
return {
'id': video_id,