desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[archiveorg] Use centralized sorting

This commit is contained in:
Philipp Hagemeister 2014-01-07 10:16:22 +01:00
parent 96f1b0741c
commit 42154ad5bc
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/archiveorg.py
View File

@ -5,7 +5,6 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
determine_ext,
unified_strdate, unified_strdate,
) )
@ -26,7 +25,6 @@ class ArchiveOrgIE(InfoExtractor):
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
@ -40,16 +38,16 @@ class ArchiveOrgIE(InfoExtractor):
uploader = data['metadata']['creator'][0] uploader = data['metadata']['creator'][0]
upload_date = unified_strdate(data['metadata']['date'][0]) upload_date = unified_strdate(data['metadata']['date'][0])
formats = [{ formats = [
{
'format': fdata['format'], 'format': fdata['format'],
'url': 'http://' + data['server'] + data['dir'] + fn, 'url': 'http://' + data['server'] + data['dir'] + fn,
'file_size': int(fdata['size']), 'file_size': int(fdata['size']),
} }
for fn,fdata in data['files'].items() for fn, fdata in data['files'].items()
if 'Video' in fdata['format']] if 'Video' in fdata['format']]
formats.sort(key=lambda fdata: fdata['file_size'])
for f in formats: self._sort_formats(formats)
f['ext'] = determine_ext(f['url'])
return { return {
'_type': 'video', '_type': 'video',