X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg.py;h=6237ac729bf12f2e209cd97b50abb05785347913;hb=5a1a4a12b965f40b165e8704b9613addbdd38331;hp=865a5eea9f925fb6ec2a8ce27b02665571772684;hpb=18feed9f91cc816eac670351c71a930fd13ec211;p=xsetbg.git diff --git a/xsetbg.py b/xsetbg.py index 865a5ee..6237ac7 100755 --- a/xsetbg.py +++ b/xsetbg.py @@ -1,55 +1,37 @@ -#! /usr/local/bin/python -O +#! /usr/bin/env python """Set a random background image (XWin) -Select a random image from $HOME/lib/xsetbg/images subdirectories -and set it as the desktop wallpaper (display it in the root window). +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 program. """ -__version__ = "$Revision$"[11:-2] -__revision__ = "$Id$"[5:-2] -__date__ = "$Date$"[7:-2] - -__author__ = "Oleg BroytMann " -__copyright__ = "Copyright (C) 2000-2006 PhiloSoft Design" +__author__ = "Oleg Broytman " +__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) -xwininfo = os.popen("xwininfo -root", 'r') -xwininfo_lines = xwininfo.read() -rc = xwininfo.close() -if rc: - error("calling xwininfo", rc) - -screen_width = None -screen_height = None -for line in xwininfo_lines.split('\n'): - line = line.strip() - if line.startswith("Width: "): - screen_width = int(line[len("Width: "):]) - elif line.startswith("Height: "): - screen_height = int(line[len("Height: "):]) - -if not screen_width or not screen_height: - error("parsing xwininfo output") - - -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() @@ -95,10 +77,35 @@ 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 +# 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.") + del config @@ -107,14 +114,13 @@ os.umask(0066) # octal; -rw-------; make the global persistent dictionary global_db_name = "xsetbg.db" -import random -import anydbm, shelve -from time import time -from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB +# DB keys +timestamp_key = "timestamp" +filename_key = "filename" +old_filename_key = "old_filename" + -# 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') @@ -126,23 +132,20 @@ except anydbm.error, msg: # Remove old filenames old_time = time() - min_delay -to_delete = [] +to_delete = [timestamp_key] for key in global_db.keys(): if key.startswith('/') and global_db[key] < old_time: to_delete.append(key) for key in to_delete: - del global_db[key] + try: + del global_db[key] + except KeyError: + pass global_db.close() # Close DB in the parent process -# DB keys -timestamp_key = "timestamp" -filename_key = "filename" -old_filename_key = "old_filename" - - images = [] for image_dir in image_dirs: @@ -154,29 +157,12 @@ if not images: error("No images found. Abort.") -try: - from PIL import Image - use_PIL = True -except ImportError: - use_PIL = False - - -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 @@ -184,11 +170,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') @@ -214,46 +195,22 @@ def run(): break global_db[image_name] = current_time - border = random.choice(borders) - root, ext = os.path.splitext(image_name) - # Save filename if global_db.has_key(filename_key): global_db[old_filename_key] = global_db[filename_key] global_db[filename_key] = image_name - placement_options = [] - if use_PIL: - image = Image.open(image_name, 'r') - im_w, im_h = image.size - del image - if (im_w > screen_width) or (im_h > screen_height): - zoom = min(screen_width*100//im_w, screen_height*100//im_h) - if zoom > 0: placement_options = ["-zoom", str(zoom)] + 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() - - - if ext.lower() in (".bmp", ".png"): - # xsetbg does not recognize BMP files. - # PNG files have gamma settings, and xli can adapt it to the display gamma; - # xloadimage/xview/xsetbg display them with wrong gamma. - program_options = ["xli", "xli", "-onroot", "-quiet"] + placement_options + \ - ["-center", "-border", border, image_name] - os.execlp(*program_options) - error("cannot execute xli!") - else: - # ...but xli failed to load many image types, use xsetbg for them - program_options = ["xsetbg", "xsetbg"] + placement_options + \ - ["-center", "-border", border, image_name] - os.execlp(*program_options) - error("cannot execute xsetbg!") - - -if __name__ == "__main__": - run()