projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
183417a
)
[loc] relax _VALID_URL regex and improve formats extraction
author
Remita Amine
<remitamine@gmail.com>
Wed, 21 Nov 2018 08:44:10 +0000
(09:44 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 21 Nov 2018 08:46:36 +0000
(09:46 +0100)
youtube_dl/extractor/libraryofcongress.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/libraryofcongress.py
b/youtube_dl/extractor/libraryofcongress.py
index 40295a30b51f733b637c651cc8a434ede14f517a..1e5c82c66ba9173447791e2f975d6f55c89e5201 100644
(file)
--- a/
youtube_dl/extractor/libraryofcongress.py
+++ b/
youtube_dl/extractor/libraryofcongress.py
@@
-16,7
+16,7
@@
from ..utils import (
class LibraryOfCongressIE(InfoExtractor):
IE_NAME = 'loc'
IE_DESC = 'Library of Congress'
class LibraryOfCongressIE(InfoExtractor):
IE_NAME = 'loc'
IE_DESC = 'Library of Congress'
- _VALID_URL = r'https?://(?:www\.)?loc\.gov/(?:item/|today/cyberlc/feature_wdesc\.php\?.*\brec=)(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://(?:www\.)?loc\.gov/(?:item/|today/cyberlc/feature_wdesc\.php\?.*\brec=)(?P<id>[0-9
a-z_.
]+)'
_TESTS = [{
# embedded via <div class="media-player"
'url': 'http://loc.gov/item/90716351/',
_TESTS = [{
# embedded via <div class="media-player"
'url': 'http://loc.gov/item/90716351/',
@@
-57,6
+57,12
@@
class LibraryOfCongressIE(InfoExtractor):
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
},
+ }, {
+ 'url': 'https://www.loc.gov/item/ihas.200197114/',
+ 'only_matching': True,
+ }, {
+ 'url': 'https://www.loc.gov/item/afc1981005_afs20503/',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-67,12
+73,13
@@
class LibraryOfCongressIE(InfoExtractor):
(r'id=(["\'])media-player-(?P<id>.+?)\1',
r'<video[^>]+id=(["\'])uuid-(?P<id>.+?)\1',
r'<video[^>]+data-uuid=(["\'])(?P<id>.+?)\1',
(r'id=(["\'])media-player-(?P<id>.+?)\1',
r'<video[^>]+id=(["\'])uuid-(?P<id>.+?)\1',
r'<video[^>]+data-uuid=(["\'])(?P<id>.+?)\1',
- r'mediaObjectId\s*:\s*(["\'])(?P<id>.+?)\1'),
+ r'mediaObjectId\s*:\s*(["\'])(?P<id>.+?)\1',
+ r'data-tab="share-media-(?P<id>[0-9A-F]{32})"'),
webpage, 'media id', group='id')
data = self._download_json(
'https://media.loc.gov/services/v1/media?id=%s&context=json' % media_id,
webpage, 'media id', group='id')
data = self._download_json(
'https://media.loc.gov/services/v1/media?id=%s&context=json' % media_id,
-
video
_id)['mediaObject']
+
media
_id)['mediaObject']
derivative = data['derivatives'][0]
media_url = derivative['derivativeUrl']
derivative = data['derivatives'][0]
media_url = derivative['derivativeUrl']
@@
-89,25
+96,29
@@
class LibraryOfCongressIE(InfoExtractor):
if ext not in ('mp4', 'mp3'):
media_url += '.mp4' if is_video else '.mp3'
if ext not in ('mp4', 'mp3'):
media_url += '.mp4' if is_video else '.mp3'
- if 'vod/mp4:' in media_url:
- formats = [{
- 'url': media_url.replace('vod/mp4:', 'hls-vod/media/') + '.m3u8',
+ formats = []
+ if '/vod/mp4:' in media_url:
+ formats.append({
+ 'url': media_url.replace('/vod/mp4:', '/hls-vod/media/') + '.m3u8',
'format_id': 'hls',
'ext': 'mp4',
'protocol': 'm3u8_native',
'quality': 1,
'format_id': 'hls',
'ext': 'mp4',
'protocol': 'm3u8_native',
'quality': 1,
- }]
- elif 'vod/mp3:' in media_url:
- formats = [{
- 'url': media_url.replace('vod/mp3:', ''),
- 'vcodec': 'none',
- }]
+ })
+ http_format = {
+ 'url': re.sub(r'(://[^/]+/)(?:[^/]+/)*(?:mp4|mp3):', r'\1', media_url),
+ 'format_id': 'http',
+ 'quality': 1,
+ }
+ if not is_video:
+ http_format['vcodec'] = 'none'
+ formats.append(http_format)
download_urls = set()
for m in re.finditer(
r'<option[^>]+value=(["\'])(?P<url>.+?)\1[^>]+data-file-download=[^>]+>\s*(?P<id>.+?)(?:(?: |\s+)\((?P<size>.+?)\))?\s*<', webpage):
format_id = m.group('id').lower()
download_urls = set()
for m in re.finditer(
r'<option[^>]+value=(["\'])(?P<url>.+?)\1[^>]+data-file-download=[^>]+>\s*(?P<id>.+?)(?:(?: |\s+)\((?P<size>.+?)\))?\s*<', webpage):
format_id = m.group('id').lower()
- if format_id
== 'gif'
:
+ if format_id
in ('gif', 'jpeg')
:
continue
download_url = m.group('url')
if download_url in download_urls:
continue
download_url = m.group('url')
if download_url in download_urls: