projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41c3a5a
)
[extractor/common] Extract namespace parse routine
author
Sergey M․
<dstftw@gmail.com>
Sat, 1 Aug 2015 19:31:17 +0000
(
01:31
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 1 Aug 2015 19:31:17 +0000
(
01:31
+0600)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index c123d9fca6dfe73eae0cdd220dec02985a8de809..717dcec7b8e39156ad5cc33aadf64ac16e92c47a 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-999,8
+999,7
@@
class InfoExtractor(object):
assert not fatal
return []
assert not fatal
return []
- namespace = self._search_regex(
- r'{([^}]+)?}smil', smil.tag, 'namespace', default=None)
+ namespace = self._parse_smil_namespace(smil)
return self._parse_smil_formats(
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
return self._parse_smil_formats(
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
@@
-1017,8
+1016,7
@@
class InfoExtractor(object):
'Unable to download SMIL file', fatal=fatal)
def _parse_smil(self, smil, smil_url, video_id, f4m_params=None):
'Unable to download SMIL file', fatal=fatal)
def _parse_smil(self, smil, smil_url, video_id, f4m_params=None):
- namespace = self._search_regex(
- r'{([^}]+)?}smil', smil.tag, 'namespace', default=None)
+ namespace = self._parse_smil_namespace(smil)
formats = self._parse_smil_formats(
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
formats = self._parse_smil_formats(
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
@@
-1045,6
+1043,10
@@
class InfoExtractor(object):
'subtitles': subtitles,
}
'subtitles': subtitles,
}
+ def _parse_smil_namespace(self, smil):
+ return self._search_regex(
+ r'(?i)^{([^}]+)?}smil$', smil.tag, 'namespace', default=None)
+
def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None):
base = smil_url
for meta in smil.findall(self._xpath_ns('./head/meta', namespace)):
def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None):
base = smil_url
for meta in smil.findall(self._xpath_ns('./head/meta', namespace)):