Merge branch 'master' of /home/phd/lib/xsetbg

[xsetbg.git] / xsetbg.py

diff --git a/xsetbg.py b/xsetbg.py
index 6fe73a8c5444b0ba3b648755ce4ab3b1bf38d492..db49a1b827b0faf52861eadabd82e9fcd61e8c2f 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -3,35 +3,29 @@
 
 Select a random image from a (list of) directory(s)
 and set it as the desktop wallpaper (display it in the root window)
-using xli or xsetbg programs.
+using xli program.
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
+__all__ = ['host', 'port', 'change']
+
 
 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
 
-from wsgiref import simple_server
-from wsgiref.handlers import SimpleHandler
-from wsgiref.simple_server import WSGIServer, make_server
-simple_server.ServerHandler = SimpleHandler # Stop logging to stdout
-
-
 def error(error_str, error_code=1):
    sys.stderr.write("%s: Error: %s\n" % (sys.argv[0], error_str))
    sys.exit(error_code)
@@ -83,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
 
@@ -98,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
@@ -149,12 +155,7 @@ if not images:
    error("No images found. Abort.")
 
 
-def published(func):
-    func._wsgi_published = True
-    return func
-
-@published
-def ping(force=False):
+def change(force=False):
    # Use the program's file as the lock file:
    # lock it to prevent two processes run in parallel.
    lock_file = open("xsetbg.py", 'r')
@@ -211,49 +212,3 @@ def ping(force=False):
       lock_file.close()
       # Flush and close the global persistent dictionary
       if global_db: global_db.close()
-
-@published
-def force():
-    ping(force=True)
-
-@published
-def stop():
-    QuitWSGIServer._quit_flag = True
-
-
-g = globals().copy()
-commands = dict([(name, g[name]) for name in g
-    if getattr(g[name], '_wsgi_published', False)])
-del g
-
-class QuitWSGIServer(WSGIServer):
-    _quit_flag = False
-
-    def serve_forever(self):
-        while not self._quit_flag:
-            self.handle_request()
-
-def app(env, start_response):
-    command = env['PATH_INFO'][1:] # Remove the leading slash
-    if command not in commands:
-        status = '404 Not found'
-        response_headers = [('Content-type', 'text/plain')]
-        start_response(status, response_headers)
-        return ['The command was not found.\n']
-
-    try:
-        commands[command]()
-    except:
-        status = '500 Error'
-        response_headers = [('Content-type', 'text/plain')]
-        start_response(status, response_headers)
-        return ['Error occured!\n']
-
-    status = '200 OK'
-    response_headers = [('Content-type', 'text/plain')]
-    start_response(status, response_headers)
-    return ['Ok\n']
-
-force()
-httpd = make_server(host, port, app, server_class=QuitWSGIServer)
-httpd.serve_forever()