X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg.py;h=db49a1b827b0faf52861eadabd82e9fcd61e8c2f;hb=39e1364c39b0b3d52a947edb466ff896884feffe;hp=a2eff700d30e58007dc6fa0e9cf90898eb8d5960;hpb=1a0b01fc4ec6633d07ad3c6a5b76bb967837e6e3;p=xsetbg.git

diff --git a/xsetbg.py b/xsetbg.py
index a2eff70..db49a1b 100755
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -7,12 +7,8 @@ using xli program.
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['host', 'port', 'change']
@@ -22,13 +18,14 @@ import sys, os
 from ConfigParser import SafeConfigParser
 
 import anydbm
+from datetime import timedelta
 import random
+import re
 import shelve
 import subprocess
 from time import time
 from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
 
-
 def error(error_str, error_code=1):
    sys.stderr.write("%s: Error: %s\n" % (sys.argv[0], error_str))
    sys.exit(error_code)
@@ -80,7 +77,21 @@ else:
 
 # minimum time in seconds between occurences of the same image
 if config.has_option("xsetbg", "min_delay"):
-   min_delay = config.getint("xsetbg", "min_delay")
+   min_delay = config.get("xsetbg", "min_delay")
+
+   # Borrowed from http://stackoverflow.com/a/2765366
+   td_re  = re.compile('(?:(?P<years>\d+)y)?(?:(?P<months>\d+)m)?(?:(?P<days>\d+)d)?(?:T(?:(?P<hours>\d+)h)?(?:(?P<minutes>\d+)m)?(?:(?P<seconds>\d+)s)?)?')
+   td_dict = td_re.match(min_delay).groupdict(0)
+   delta = timedelta(days=int(td_dict['days']) + (int(td_dict['months']) * 30) + (int(td_dict['years']) * 365),
+                     hours=int(td_dict['hours']),
+                     minutes=int(td_dict['minutes']),
+                     seconds=int(td_dict['seconds']))
+
+   if delta:
+      min_delay = delta.days * 24*3600 + delta.seconds
+   else:
+      min_delay = int(min_delay)
+
 else:
    min_delay = 3600*24 # 24 hours
 
@@ -95,8 +106,6 @@ if config.has_option("httpd", "port"):
 else:
    error("Config must specify a port to listen. Abort.")
 
-del config
-
 
 os.umask(0066) # octal; -rw-------; make the global persistent dictionary
                # readable only by the user