projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Introduce base_url
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 2e9f05ae3b36583f721a045cdb16aa1a3e8f849e..140ccf23422c88b9fa4524f26b7fca5b06e1bda1 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-30,6
+30,7
@@
from ..downloader.f4m import remove_encrypted_media
from ..utils import (
NO_DEFAULT,
age_restricted,
from ..utils import (
NO_DEFAULT,
age_restricted,
+ base_url,
bug_reports_message,
clean_html,
compiled_regex_type,
bug_reports_message,
clean_html,
compiled_regex_type,
@@
-1539,7
+1540,7
@@
class InfoExtractor(object):
if res is False:
return []
mpd, urlh = res
if res is False:
return []
mpd, urlh = res
- mpd_base_url =
re.match(r'https?://[^?#&]+/', urlh.geturl()).group(
)
+ mpd_base_url =
base_url(urlh.geturl()
)
return self._parse_mpd_formats(
compat_etree_fromstring(mpd.encode('utf-8')), mpd_id, mpd_base_url,
return self._parse_mpd_formats(
compat_etree_fromstring(mpd.encode('utf-8')), mpd_id, mpd_base_url,
@@
-1797,7
+1798,7
@@
class InfoExtractor(object):
if ism_doc.get('IsLive') == 'TRUE' or ism_doc.find('Protection') is not None:
return []
if ism_doc.get('IsLive') == 'TRUE' or ism_doc.find('Protection') is not None:
return []
- ism_base_url =
re.match(r'https?://.+/', ism_url).group(
)
+ ism_base_url =
base_url(ism_url
)
duration = int(ism_doc.attrib['Duration'])
timescale = int_or_none(ism_doc.get('TimeScale')) or 10000000
duration = int(ism_doc.attrib['Duration'])
timescale = int_or_none(ism_doc.get('TimeScale')) or 10000000