From: Oleg Broytman Date: Sun, 19 Aug 2012 15:16:59 +0000 (+0000) Subject: Parse timedelta in ymdThms format. X-Git-Tag: v4.0.0~12 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=5a1a4a12b965f40b165e8704b9613addbdd38331;p=xsetbg.git Parse timedelta in ymdThms format. git-svn-id: file:///home/phd/archive/SVN/xsetbg/trunk@56 143022c7-580b-0410-bae3-87f2bf5d3141 --- diff --git a/xsetbg.py b/xsetbg.py index 10f76db..6237ac7 100755 --- a/xsetbg.py +++ b/xsetbg.py @@ -18,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) @@ -76,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\d+)y)?(?:(?P\d+)m)?(?:(?P\d+)d)?(?:T(?:(?P\d+)h)?(?:(?P\d+)m)?(?:(?P\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