X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/f2554cc07990a990e373bf499e9b0a40dccfe7c9..f6fd0f461b4b1ec453e7f84d0e262e1f34a7907f:/randombg.py diff --git a/randombg.py b/randombg.py index bb4050c..00c7d54 100755 --- a/randombg.py +++ b/randombg.py @@ -7,8 +7,12 @@ import asyncore, asynchat, socket import os, os.path, random, sys, time from optparse import OptionParser import logging -from logging import debug, info, warning, error, critical -logging.basicConfig(format="%(levelname)s: %(message)s") +try: + logging.basicConfig(format="%(levelname)s: %(message)s") +except TypeError: +# Python 2.3's logging.basicConfig does not support parameters + logging.basicConfig() + try: import cPickle as pickle except ImportError: @@ -19,7 +23,7 @@ try: import asyncsched import wallchanger except ImportError, e: - critical("Missing libraries! Exiting...") + logging.critical("Missing libraries! Exiting...", exc_info=1) sys.exit(1) @@ -36,22 +40,23 @@ class BaseFileList(object): """Base file list implementation""" def __init__(self): self.paths = [] + self.favourites = [] def add_path(self, path): self.paths.append(path) def store_cache(self, filename): try: - debug("Attempting to store cache") + logging.debug("Attempting to store cache") fd = open(filename, 'wb') - pickle.dump(obj = self, file = fd, protocol = 2) - debug("Cache successfully stored") + pickle.dump(self, fd, 2) + logging.debug("Cache successfully stored") except Exception, e: warning("Storing cache: %s" % e) def load_cache(self, filename): try: - debug("Attempting to load cache from: %s" % filename) + logging.debug("Attempting to load cache from: %s" % filename) self.paths.sort() fd = open(filename, 'rb') @@ -60,19 +65,24 @@ class BaseFileList(object): if tmp.__class__ != self.__class__: raise ValueError("Using different file list type") - self.paths.sort() - if self.paths != getattr(tmp, "paths"): - raise ValueError("Path list changed") + tmp.paths.sort() + if self.paths != tmp.paths: + raise ValueError, "Path list changed" + # Overwrite this object with the other for attr, value in tmp.__dict__.items(): setattr(self, attr, value) return True except Exception, e: - warning("Loading cache: %s" % e) + logging.warning("Loading cache: %s" % e) return False + def add_to_favourites(self): + '''Adds the current image to the list of favourites''' + self.favourites.append(self.get_current_image()) + def scan_paths(self): raise NotImplementedError() @@ -101,10 +111,14 @@ class RandomFileList(BaseFileList): for filename in filter_images(filenames): self.list.append(os.path.join(dirpath, filename)) + def add_path(self, path): + self.paths.append(path) + logging.debug('Added path "%s" to the list' % path) + def get_next_image(self): n = random.randint(0, len(self.list)-1) self.last_image = self.list[n] - debug("Picked file '%s' from list" % self.last_image) + logging.debug("Picked file '%s' from list" % self.last_image) return self.last_image def get_current_image(self): @@ -125,16 +139,30 @@ class AllRandomFileList(BaseFileList): # Scan the input directory, and then randomize the file list def scan_paths(self): + logging.debug("Scanning paths") + self.list = [] for path in self.paths: - debug('Scanning "%s"' % path) + logging.debug('Scanning "%s"' % path) for dirpath, dirsnames, filenames in os.walk(path): for filename in filter_images(filenames): - debug('Adding file "%s"' % filename) + logging.debug('Adding file "%s"' % filename) self.list.append(os.path.join(dirpath, filename)) random.shuffle(self.list) + def add_path(self, path): + self.paths.append(path) + logging.debug('Added path "%s" to the list' % path) + + def store_cache(self, filename): + try: + fd = open(filename, 'wb') + pickle.dump(self, fd, 2) + logging.debug("Cache successfully stored") + except Exception, e: + logging.warning("Storing cache", exc_info=1) + def get_current_image(self): return self.list[self.imagePointer] @@ -146,18 +174,19 @@ class AllRandomFileList(BaseFileList): def get_next_image(self): self.imagePointer = self.__inc_in_range(self.imagePointer) imageName = self.list[self.imagePointer] - debug("Picked file '%s' (pointer=%d) from list" % (imageName, self.imagePointer)) + logging.debug("Picked file '%s' (pointer=%d) from list" % (imageName, self.imagePointer)) return imageName def get_prev_image(self): self.imagePointer = self.__inc_in_range(self.imagePointer, amount=-1) imageName = self.list[self.imagePointer] - debug("Picked file '%s' (pointer=%d) from list" % (imageName, self.imagePointer)) + logging.debug("Picked file '%s' (pointer=%d) from list" % (imageName, self.imagePointer)) return imageName def is_empty(self): return len(self.list) == 0 + class FolderRandomFileList(BaseFileList): """A file list that will pick a file randomly within a directory. Each directory has the same chance of being chosen.""" @@ -167,25 +196,27 @@ class FolderRandomFileList(BaseFileList): self.last_image = None def scan_paths(self): - for path in self.paths: - for dirpath, dirs, filenames in os.walk(path): - debug('Scanning "%s" for images' % dirpath) - if self.directories.has_key(dirpath): - continue - filenames = list(filter_images(filenames)) - if len(filenames): - self.directories[dirpath] = filenames - debug('Adding "%s" to "%s"' % (filenames, dirpath)) - else: - debug("No images found in '%s'" % dirpath) - + pass + + def add_path(self, path): + logging.debug('Added path "%s" to the list' % path) + for dirpath, dirs, filenames in os.walk(path): + logging.debug('Scanning "%s" for images' % dirpath) + if self.directories.has_key(dirpath): + continue + filenames = list(filter_images(filenames)) + if len(filenames): + self.directories[dirpath] = filenames + logging.debug('Adding "%s" to "%s"' % (filenames, dirpath)) + else: + logging.debug("No images found in '%s'" % dirpath) + def get_next_image(self): directory = random.choice(self.directories.keys()) - debug('directory: "%s"' % directory) + logging.debug('directory: "%s"' % directory) filename = random.choice(self.directories[directory]) - debug('filename: "%s"' % filename) - self.last_image = os.path.join(directory, filename) - return self.last_image + logging.debug('filename: "%s"' % filename) + return os.path.join(directory, filename) def get_current_image(self): if self.last_image: @@ -198,14 +229,14 @@ class FolderRandomFileList(BaseFileList): class Cycler(object): - def init(self, options, paths): + def init(self, options, paths, oneshot=False): self.cycle_time = options.cycle_time self.history_filename = options.history_filename - debug("Initialising wallchanger") - wallchanger.init(options.background_colour, options.permanent) + logging.debug("Initialising wallchanger") + wallchanger.init(options.background_colour, options.permanent, options.convert) - debug("Initialising file list") + logging.debug("Initialising file list") if options.all_random: self.filelist = AllRandomFileList() elif options.folder_random: @@ -217,17 +248,20 @@ class Cycler(object): self.filelist.add_path(path) if self.filelist.load_cache(self.history_filename): - debug("Loaded cache successfully") + logging.debug("Loaded cache successfully") else: - debug("Could not load cache") + logging.debug("Could not load cache") self.filelist.scan_paths() if self.filelist.is_empty(): - error("No images were found. Exiting...") + logging.error("No images were found. Exiting...") sys.exit(1) self.task = None - self.cmd_reload() + if oneshot: + self.cmd_next() + else: + self.cmd_reload() def finish(self): self.filelist.store_cache(self.history_filename) @@ -245,7 +279,8 @@ class Cycler(object): if self.task is not None: self.task.cancel() self.task = asyncsched.schedule(self.cycle_time, next) - debug("Reset timer for %s seconds" % self.cycle_time) + logging.debug("Reset timer for %s seconds" % self.cycle_time) + self.filelist.store_cache(self.history_filename) def cmd_reload(self): image = self.filelist.get_current_image() @@ -273,6 +308,9 @@ class Cycler(object): def cmd_exit(self): asyncsched.exit() + def cmd_favourite(self): + self.filelist.add_to_favourites() + class Server(asynchat.async_chat): def __init__(self, cycler, conn, addr): asynchat.async_chat.__init__(self, conn=conn) @@ -288,14 +326,13 @@ class Server(asynchat.async_chat): self.ibuffer = [] prefix, cmd = line.split(None, 1) if prefix != "cmd": - debug('Bad line received "%s"' % line) + logging.debug('Bad line received "%s"' % line) return if hasattr(self.cycler, "cmd_" + cmd): - debug('Executing command "%s"' % cmd) + logging.debug('Executing command "%s"' % cmd) getattr(self.cycler, "cmd_" + cmd)() else: - debug('Unknown command received "%s"' % cmd) - + logging.debug('Unknown command received "%s"' % cmd) class Listener(asyncore.dispatcher): @@ -340,13 +377,13 @@ def do_client(options, args): sock = sock.makefile() for i, cmd in enumerate(args): sock.write("cmd %s\n" % cmd) - if i+1 != len(args): + if i < len(args) - 1: time.sleep(options.cycle_time) sock.close() def do_oneshot(options, paths): cycler = Cycler() - cycler.init(options, paths) + cycler.init(options, paths, oneshot=True) def build_parser(): parser = OptionParser(version="%prog " + VERSION, @@ -399,13 +436,12 @@ def main(): if options.oneshot: do_oneshot(options, args) - - if os.path.exists(options.socket_filename): - do_client(options, args) else: - do_server(options, args) + if os.path.exists(options.socket_filename): + do_client(options, args) + else: + do_server(options, args) if __name__ == "__main__": main() -