diff options
| author | Florent Le Coz <louiz@louiz.org> | 2011-11-15 12:30:09 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2011-11-15 12:30:09 +0100 |
| commit | d789a59f0c1d849e3074c890913882f09b048cd2 (patch) | |
| tree | 4f6d62c7f5a5c4abafe0e9ff9546be7f136d4d3b /plugins/reminder.py | |
| parent | 4e201be745521ace9701623d684dde316cb43af4 (diff) | |
| parent | 4208920f425e9f37072715e52a5c7e95f074ab6e (diff) | |
| download | poezio-d789a59f0c1d849e3074c890913882f09b048cd2.tar.gz poezio-d789a59f0c1d849e3074c890913882f09b048cd2.tar.bz2 poezio-d789a59f0c1d849e3074c890913882f09b048cd2.tar.xz poezio-d789a59f0c1d849e3074c890913882f09b048cd2.zip | |
Merge branch 'master' of http://git.louiz.org/poezio
Diffstat (limited to 'plugins/reminder.py')
| -rw-r--r-- | plugins/reminder.py | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/plugins/reminder.py b/plugins/reminder.py index 8426dcfe..ed45985c 100644 --- a/plugins/reminder.py +++ b/plugins/reminder.py @@ -29,11 +29,29 @@ class Plugin(BasePlugin): args = common.shell_split(arg) if len(args) < 2: return + if args[0].endswith('d'): + modifier = 'd' + elif args[0].endswith('h'): + modifier = 'h' + elif args[0].endswith('m'): + modifier = 'm' + else: + modifier = None try: - time = int(args[0]) + if modifier: + time = int(args[0][:-1]) + else: + time = int(args[0]) except: return + if modifier == 'd': + time = time * 86400 + elif modifier == 'h': + time = time * 3600 + elif modifier == 'm': + time = time * 60 + self.tasks[self.count] = (time, args[1]) timed_event = timed_events.DelayedEvent(time, self.remind, self.count) self.core.add_timed_event(timed_event) @@ -47,7 +65,7 @@ class Plugin(BasePlugin): if txt.endswith(' '): n += 1 if n == 2: - return the_input.auto_completion(["60", "300", "600", "900", "3600", "36000", "86400"], '') + return the_input.auto_completion(["60", "5m", "15m", "30m", "1h", "10h", "1d"], '') def completion_done(self, the_input): return the_input.auto_completion(["%s" % key for key in self.tasks], '') |