projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ntv] Add support for ntv.ru (Closes #2581)
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 68d590ba25f812ba96f0c97d81f932200059a155..29c9b1a4cb6fdef970617fd6b556454cb7eff07d 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-1186,7
+1186,7
@@
def parse_duration(s):
return None
m = re.match(
return None
m = re.match(
- r'(?:(?:(?P<hours>[0-9]+)[:h])?(?P<mins>[0-9]+)[:m])?(?P<secs>[0-9]+)s?$', s)
+ r'(?:(?:(?P<hours>[0-9]+)[:h])?(?P<mins>[0-9]+)[:m])?(?P<secs>[0-9]+)s?
(?::[0-9]+)?
$', s)
if not m:
return None
res = int(m.group('secs'))
if not m:
return None
res = int(m.group('secs'))
@@
-1328,3
+1328,7
@@
US_RATINGS = {
'R': 16,
'NC': 18,
}
'R': 16,
'NC': 18,
}
+
+
+def strip_jsonp(code):
+ return re.sub(r'(?s)^[a-zA-Z_]+\s*\(\s*(.*)\);\s*?\s*$', r'\1', code)