projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dstftw/correct-valid-urls'
[youtube-dl]
/
youtube_dl
/
extractor
/
archiveorg.py
diff --git
a/youtube_dl/extractor/archiveorg.py
b/youtube_dl/extractor/archiveorg.py
index 61ce4469a05dd3cdf9bddbecf8c82119c40b5c3f..8bb546410f7a7486bdaa964bc724cf2c501e8851 100644
(file)
--- a/
youtube_dl/extractor/archiveorg.py
+++ b/
youtube_dl/extractor/archiveorg.py
@@
-11,7
+11,7
@@
from ..utils import (
class ArchiveOrgIE(InfoExtractor):
IE_NAME = 'archive.org'
IE_DESC = 'archive.org videos'
class ArchiveOrgIE(InfoExtractor):
IE_NAME = 'archive.org'
IE_DESC = 'archive.org videos'
- _VALID_URL = r'(?:https?://)?(?:www\.)?archive.org/details/(?P<id>[^?/]+)(?:[?].*)?$'
+ _VALID_URL = r'(?:https?://)?(?:www\.)?archive
\
.org/details/(?P<id>[^?/]+)(?:[?].*)?$'
_TEST = {
u"url": u"http://archive.org/details/XD300-23_68HighlightsAResearchCntAugHumanIntellect",
u'file': u'XD300-23_68HighlightsAResearchCntAugHumanIntellect.ogv',
_TEST = {
u"url": u"http://archive.org/details/XD300-23_68HighlightsAResearchCntAugHumanIntellect",
u'file': u'XD300-23_68HighlightsAResearchCntAugHumanIntellect.ogv',
@@
-49,7
+49,7
@@
class ArchiveOrgIE(InfoExtractor):
for f in formats:
f['ext'] = determine_ext(f['url'])
for f in formats:
f['ext'] = determine_ext(f['url'])
-
info =
{
+
return
{
'_type': 'video',
'id': video_id,
'title': title,
'_type': 'video',
'id': video_id,
'title': title,
@@
-57,12
+57,5
@@
class ArchiveOrgIE(InfoExtractor):
'description': description,
'uploader': uploader,
'upload_date': upload_date,
'description': description,
'uploader': uploader,
'upload_date': upload_date,
+ 'thumbnail': data.get('misc', {}).get('image'),
}
}
- thumbnail = data.get('misc', {}).get('image')
- if thumbnail:
- info['thumbnail'] = thumbnail
-
- # TODO: Remove when #980 has been merged
- info.update(formats[-1])
-
- return info