diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-02 21:48:54 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-02 21:48:54 +0100 |
commit | 8f4b58d70e29df13d6002579b5c9448acc89d6c1 (patch) | |
tree | 887a1e49cee709f58e7773bd5e9f2b73a1768351 /youtube_dl/utils.py | |
parent | 3fd45e03bf86c2ad2ef17362452a9a745dc10755 (diff) |
[ntvde] Add new extractor (Fixes #4850)
Diffstat (limited to 'youtube_dl/utils.py')
-rw-r--r-- | youtube_dl/utils.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 4ade0554e..251074bf5 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1275,7 +1275,10 @@ def parse_duration(s): (?P<only_hours>[0-9.]+)\s*(?:hours?)| (?: - (?:(?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s*)? + (?: + (?:(?P<days>[0-9]+)\s*(?:[:d]|days?)\s*)? + (?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s* + )? (?P<mins>[0-9]+)\s*(?:[:m]|mins?|minutes?)\s* )? (?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*(?:s|secs?|seconds?)? @@ -1293,6 +1296,8 @@ def parse_duration(s): res += int(m.group('mins')) * 60 if m.group('hours'): res += int(m.group('hours')) * 60 * 60 + if m.group('days'): + res += int(m.group('days')) * 24 * 60 * 60 if m.group('ms'): res += float(m.group('ms')) return res @@ -1543,7 +1548,7 @@ def js_to_json(code): res = re.sub(r'''(?x) "(?:[^"\\]*(?:\\\\|\\")?)*"| '(?:[^'\\]*(?:\\\\|\\')?)*'| - [a-zA-Z_][a-zA-Z_0-9]* + [a-zA-Z_][.a-zA-Z_0-9]* ''', fix_kv, code) res = re.sub(r',(\s*\])', lambda m: m.group(1), res) return res |