From 9a32229d0bcadf5fcccb493f18efb0e240b1fa6c Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 15 Nov 2011 21:37:04 +0100
Subject: Add the 's' modifier (allow a string to be "50s1d1d4m1s")

---
 src/common.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/common.py')

diff --git a/src/common.py b/src/common.py
index 48613847..fdad77a9 100644
--- a/src/common.py
+++ b/src/common.py
@@ -194,7 +194,7 @@ def replace_key_with_bound(key):
         return key
 
 def parse_str_to_secs(duration=''):
-    values = {'m': 60, 'h': 3600, 'd': 86400}
+    values = {'s': 1, 'm': 60, 'h': 3600, 'd': 86400}
     result = 0
     tmp = '0'
     for char in duration:
@@ -211,7 +211,6 @@ def parse_str_to_secs(duration=''):
     return result
 
 def parse_secs_to_str(duration=0):
-    values = {60: 'm', 3600:'h', 86400:'d'}
     secs, mins, hours, days = 0, 0, 0, 0
     result = ''
     secs = duration % 60
-- 
cgit v1.2.3