projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gameone] simplify playlist extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
archiveorg.py
diff --git
a/youtube_dl/extractor/archiveorg.py
b/youtube_dl/extractor/archiveorg.py
index 497ce97acbef0c20f3050bed69bba410d7f8767c..34ce8429b121261784a1645c28e2a33cb76bcacb 100644
(file)
--- 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 (
from .common import InfoExtractor
from ..utils import (
- determine_ext,
unified_strdate,
)
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')
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])
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']),
}
'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']]
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',
return {
'_type': 'video',