commit 42154ad5bcd2aa5606fc4afdc7deceadbf496b19
parent 96f1b0741caa0356eb1ab1b2215d357f2f647840
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 7 Jan 2014 10:16:22 +0100
[archiveorg] Use centralized sorting
Diffstat:
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dl/extractor/archiveorg.py
@@ -5,7 +5,6 @@ import re
from .common import InfoExtractor
from ..utils import (
- determine_ext,
unified_strdate,
)
@@ -26,7 +25,6 @@ class ArchiveOrgIE(InfoExtractor):
}
}
-
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
@@ -40,16 +38,16 @@ class ArchiveOrgIE(InfoExtractor):
uploader = data['metadata']['creator'][0]
upload_date = unified_strdate(data['metadata']['date'][0])
- formats = [{
+ formats = [
+ {
'format': fdata['format'],
'url': 'http://' + data['server'] + data['dir'] + fn,
'file_size': int(fdata['size']),
}
- for fn,fdata in data['files'].items()
+ for fn, fdata in data['files'].items()
if 'Video' in fdata['format']]
- formats.sort(key=lambda fdata: fdata['file_size'])
- for f in formats:
- f['ext'] = determine_ext(f['url'])
+
+ self._sort_formats(formats)
return {
'_type': 'video',