mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-10 09:07:58 +01:00
[teamcoco] Use centralized sorting
This commit is contained in:
parent
bb198c95e2
commit
befdc8f3b6
1 changed files with 17 additions and 12 deletions
|
@ -38,29 +38,34 @@ def _real_extract(self, url):
|
||||||
|
|
||||||
qualities = ['500k', '480p', '1000k', '720p', '1080p']
|
qualities = ['500k', '480p', '1000k', '720p', '1080p']
|
||||||
formats = []
|
formats = []
|
||||||
for file in data.findall('files/file'):
|
for filed in data.findall('files/file'):
|
||||||
if file.attrib.get('playmode') == 'all':
|
if filed.attrib.get('playmode') == 'all':
|
||||||
# it just duplicates one of the entries
|
# it just duplicates one of the entries
|
||||||
break
|
break
|
||||||
file_url = file.text
|
file_url = filed.text
|
||||||
m_format = re.search(r'(\d+(k|p))\.mp4', file_url)
|
m_format = re.search(r'(\d+(k|p))\.mp4', file_url)
|
||||||
if m_format is not None:
|
if m_format is not None:
|
||||||
format_id = m_format.group(1)
|
format_id = m_format.group(1)
|
||||||
else:
|
else:
|
||||||
format_id = file.attrib['bitrate']
|
format_id = filed.attrib['bitrate']
|
||||||
|
tbr = (
|
||||||
|
int(filed.attrib['bitrate'])
|
||||||
|
if filed.attrib['bitrate'].isdigit()
|
||||||
|
else None)
|
||||||
|
|
||||||
|
try:
|
||||||
|
quality = qualities.index(format_id)
|
||||||
|
except ValueError:
|
||||||
|
quality = -1
|
||||||
formats.append({
|
formats.append({
|
||||||
'url': file_url,
|
'url': file_url,
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
|
'tbr': tbr,
|
||||||
'format_id': format_id,
|
'format_id': format_id,
|
||||||
|
'quality': quality,
|
||||||
})
|
})
|
||||||
def sort_key(f):
|
|
||||||
try:
|
self._sort_formats(formats)
|
||||||
return qualities.index(f['format_id'])
|
|
||||||
except ValueError:
|
|
||||||
return -1
|
|
||||||
formats.sort(key=sort_key)
|
|
||||||
if not formats:
|
|
||||||
raise ExtractorError('Unable to extract video URL')
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
Loading…
Reference in a new issue