diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-02 16:45:49 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-02 16:45:49 +0200 |
| commit | e6f7ba06c3d7ab9708f4960cbf359684155f9a5f (patch) | |
| tree | 42799025e3d7b65e20295ac8a87b114924846601 /module/plugins/internal/Plugin.py | |
| parent | [ClickAndLoad] Queue destination support (2) (diff) | |
| download | pyload-e6f7ba06c3d7ab9708f4960cbf359684155f9a5f.tar.xz | |
Fix https://github.com/pyload/pyload/issues/1911#issuecomment-145026557
Diffstat (limited to 'module/plugins/internal/Plugin.py')
| -rw-r--r-- | module/plugins/internal/Plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 4ab330975..cc35d919c 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -110,7 +110,7 @@ def parse_time(string): else: this = re.compile("this", re.I) - regex = re.compile(r'(\d+|\w+)\s*(hr|hour|min|sec|)', re.I) + regex = re.compile(r'(\d+|[\w\-]+)\s*(hr|hour|min|sec|)', re.I) time = sum(1 if this.match(v) else str2int(v) * {'hr': 3600, 'hour': 3600, 'min': 60, 'sec': 1, '': 1}[u.lower()] @@ -228,7 +228,7 @@ def chunks(iterable, size): class Plugin(object): __name__ = "Plugin" __type__ = "plugin" - __version__ = "0.45" + __version__ = "0.46" __status__ = "testing" __pattern__ = r'^unmatchable$' |