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

diff --git a/xsetbg.py b/xsetbg.py
index efebc85..db49a1b 100755
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -3,35 +3,35 @@
 
 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 BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2000-2009 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
 
+import sys, os
+from ConfigParser import SafeConfigParser
 
-def usage():
-   sys.stderr.write("%s version %s\n" % (sys.argv[0], __version__))
-   sys.stderr.write("Usage: %s [force]\n" % sys.argv[0])
-   sys.exit(0)
+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)
 
 
-from ConfigParser import SafeConfigParser
-
-xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
+xsetbg_dir = os.path.dirname(os.path.abspath(__file__))
 os.chdir(xsetbg_dir)
 
 config = SafeConfigParser()
@@ -77,11 +77,34 @@ 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
 
-del config
+# httpd settings
+if config.has_option("httpd", "host"):
+   host = config.get("httpd", "host")
+else:
+   host = 'localhost'
+
+if config.has_option("httpd", "port"):
+   port = config.getint("httpd", "port")
+else:
+   error("Config must specify a port to listen. Abort.")
 
 
 os.umask(0066) # octal; -rw-------; make the global persistent dictionary
@@ -95,14 +118,7 @@ filename_key = "filename"
 old_filename_key = "old_filename"
 
 
-import random
-import anydbm, shelve
-from time import time
-from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
-
-# Import pickle and all anydbm/shelve internal machinery, so that
-# when ReadyExec forks they will be ready.
-# Also create the database if it is not exists yet.
+# Create the database if it is not exists yet.
 
 try:
    global_db = shelve.open(global_db_name, flag='c')
@@ -139,22 +155,12 @@ if not images:
    error("No images found. Abort.")
 
 
-def run():
-   if len(sys.argv) not in (1, 2):
-      usage()
-
-   force = False
-   if len(sys.argv) == 2:
-      if sys.argv[1] == "force":
-         force = True
-      else:
-         usage()
-
+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')
    try:
-      flock(lock_file , LOCK_EX|LOCK_NB)
+      flock(lock_file, LOCK_EX|LOCK_NB)
    except IOError: # already locked
       lock_file.close()
       return
@@ -162,11 +168,6 @@ def run():
 
    global_db = None
    try:
-      # Re-seed the RNG; this is neccessary because ReadyExecd forks
-      # and RNG in a child process got the same seed from the parent
-      # after every fork.
-      random.seed()
-
       # Reopen the global persistent dictionary
       global_db = shelve.open(global_db_name, 'w')
 
@@ -197,20 +198,17 @@ def run():
          global_db[old_filename_key] = global_db[filename_key]
       global_db[filename_key] = image_name
 
+      program_options = ["xli", "-onroot", "-quiet"] + \
+         ["-center", "-border", random.choice(borders), "-zoom", "auto",
+            image_name]
+
+      rc = subprocess.call(program_options)
+      if rc:
+         error("cannot execute xli!")
+
    finally:
       # Unlock and close the lock file
-      flock(lock_file , LOCK_UN)
+      flock(lock_file, LOCK_UN)
       lock_file.close()
       # Flush and close the global persistent dictionary
       if global_db: global_db.close()
-
-   program_options = ["xli", "xli", "-onroot", "-quiet"] + \
-      ["-center", "-border", random.choice(borders), "-zoom", "auto",
-         image_name]
-
-   os.execlp(*program_options)
-   error("cannot execute xli!")
-
-
-if __name__ == "__main__":
-   run()