projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f52183a
)
[extractor/common] Use baseURL from f4m manifest for recursive manifest extraction
author
Sergey M․
<dstftw@gmail.com>
Sat, 21 Nov 2015 12:01:39 +0000
(18:01 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 21 Nov 2015 12:01:39 +0000
(18:01 +0600)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 5e263f8b5a2cf46fbb26e928f5df85c87c42dfde..71bdcad5ae34e47690ec70ac7873e6d9960b894b 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-891,6
+891,11
@@
class InfoExtractor(object):
if not media_nodes:
manifest_version = '2.0'
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
if not media_nodes:
manifest_version = '2.0'
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
+ base_url = xpath_text(
+ manifest, ['{http://ns.adobe.com/f4m/1.0}baseURL', '{http://ns.adobe.com/f4m/2.0}baseURL'],
+ 'base URL', default=None)
+ if base_url:
+ base_url = base_url.strip()
for i, media_el in enumerate(media_nodes):
if manifest_version == '2.0':
media_url = media_el.attrib.get('href') or media_el.attrib.get('url')
for i, media_el in enumerate(media_nodes):
if manifest_version == '2.0':
media_url = media_el.attrib.get('href') or media_el.attrib.get('url')
@@
-898,7
+903,7
@@
class InfoExtractor(object):
continue
manifest_url = (
media_url if media_url.startswith('http://') or media_url.startswith('https://')
continue
manifest_url = (
media_url if media_url.startswith('http://') or media_url.startswith('https://')
- else (
'/'.join(manifest_url.split('/')[:-1]
) + '/' + media_url))
+ else (
(base_url or '/'.join(manifest_url.split('/')[:-1])
) + '/' + media_url))
# If media_url is itself a f4m manifest do the recursive extraction
# since bitrates in parent manifest (this one) and media_url manifest
# may differ leading to inability to resolve the format by requested
# If media_url is itself a f4m manifest do the recursive extraction
# since bitrates in parent manifest (this one) and media_url manifest
# may differ leading to inability to resolve the format by requested