projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Introduce url_or_none
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index d61af88378727f6e2df201f129e05554da52d3ae..b84436ed64cc264659dd0a70811e2812612709cc 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-184,6
+184,7
@@
DATE_FORMATS_MONTH_FIRST.extend([
])
PACKED_CODES_RE = r"}\('(.+)',(\d+),(\d+),'([^']+)'\.split\('\|'\)"
])
PACKED_CODES_RE = r"}\('(.+)',(\d+),(\d+),'([^']+)'\.split\('\|'\)"
+JSON_LD_RE = r'(?is)<script[^>]+type=(["\'])application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>'
def preferredencoding():
def preferredencoding():
@@
-1228,7
+1229,7
@@
def unified_timestamp(date_str, day_first=True):
def determine_ext(url, default_ext='unknown_video'):
def determine_ext(url, default_ext='unknown_video'):
- if url is None:
+ if url is None
or '.' not in url
:
return default_ext
guess = url.partition('?')[0].rpartition('.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess):
return default_ext
guess = url.partition('?')[0].rpartition('.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess):
@@
-1865,6
+1866,13
@@
def strip_or_none(v):
return None if v is None else v.strip()
return None if v is None else v.strip()
+def url_or_none(url):
+ if not url or not isinstance(url, compat_str):
+ return None
+ url = url.strip()
+ return url if re.match(r'^(?:[a-zA-Z][\da-zA-Z.+-]*:)?//', url) else None
+
+
def parse_duration(s):
if not isinstance(s, compat_basestring):
return None
def parse_duration(s):
if not isinstance(s, compat_basestring):
return None
@@
-2253,12
+2261,12
@@
US_RATINGS = {
TV_PARENTAL_GUIDELINES = {
TV_PARENTAL_GUIDELINES = {
- 'Y': 0,
- 'Y7': 7,
- 'G': 0,
- 'PG': 0,
- '14': 14,
- 'MA': 17,
+ '
TV-
Y': 0,
+ '
TV-
Y7': 7,
+ '
TV-
G': 0,
+ '
TV-
PG': 0,
+ '
TV-
14': 14,
+ '
TV-
MA': 17,
}
}
@@
-2272,16
+2280,16
@@
def parse_age_limit(s):
return int(m.group('age'))
if s in US_RATINGS:
return US_RATINGS[s]
return int(m.group('age'))
if s in US_RATINGS:
return US_RATINGS[s]
- m = re.match(r'^TV[_-]?(%s)$' % '|'.join(
TV_PARENTAL_GUIDELINES.keys()
), s)
+ m = re.match(r'^TV[_-]?(%s)$' % '|'.join(
k[3:] for k in TV_PARENTAL_GUIDELINES
), s)
if m:
if m:
- return TV_PARENTAL_GUIDELINES[m.group(1)]
+ return TV_PARENTAL_GUIDELINES[
'TV-' +
m.group(1)]
return None
def strip_jsonp(code):
return re.sub(
r'''(?sx)^
return None
def strip_jsonp(code):
return re.sub(
r'''(?sx)^
- (?:window\.)?(?P<func_name>[a-zA-Z0-9_.$]
+
)
+ (?:window\.)?(?P<func_name>[a-zA-Z0-9_.$]
*
)
(?:\s*&&\s*(?P=func_name))?
\s*\(\s*(?P<callback_data>.*)\);?
\s*?(?://[^\n]*)*$''',
(?:\s*&&\s*(?P=func_name))?
\s*\(\s*(?P<callback_data>.*)\);?
\s*?(?://[^\n]*)*$''',
@@
-2667,6
+2675,7
@@
def dfxp2srt(dfxp_data):
]
_x = functools.partial(xpath_with_ns, ns_map={
]
_x = functools.partial(xpath_with_ns, ns_map={
+ 'xml': 'http://www.w3.org/XML/1998/namespace',
'ttml': 'http://www.w3.org/ns/ttml',
'tts': 'http://www.w3.org/ns/ttml#styling',
})
'ttml': 'http://www.w3.org/ns/ttml',
'tts': 'http://www.w3.org/ns/ttml#styling',
})
@@
-2758,7
+2767,9
@@
def dfxp2srt(dfxp_data):
repeat = False
while True:
for style in dfxp.findall(_x('.//ttml:style')):
repeat = False
while True:
for style in dfxp.findall(_x('.//ttml:style')):
- style_id = style.get('id')
+ style_id = style.get('id') or style.get(_x('xml:id'))
+ if not style_id:
+ continue
parent_style_id = style.get('style')
if parent_style_id:
if parent_style_id not in styles:
parent_style_id = style.get('style')
if parent_style_id:
if parent_style_id not in styles: