X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/26149d42b633dcd7452d55da3c6580dccb00b74b..a8d026613301bb315f8f66f50b1b35d8db996744:/randombg.py diff --git a/randombg.py b/randombg.py index bb4050c..d069b49 100755 --- a/randombg.py +++ b/randombg.py @@ -7,7 +7,6 @@ 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: import cPickle as pickle @@ -19,7 +18,7 @@ try: import asyncsched import wallchanger except ImportError, e: - critical("Missing libraries! Exiting...") + logging.critical("Missing libraries! Exiting...") sys.exit(1) @@ -101,10 +100,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 +128,48 @@ 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(obj = self, file = fd, protocol = 2) + logging.debug("Cache successfully stored") + except Exception, e: + logging.warning("Storing cache", exc_info=1) + + def load_cache(self, filename, rescanPaths = False): + logging.debug('Attempting to load cache from "%s"' % filename) + self.paths.sort() + try: + fd = open(filename, 'rb') + tmp = pickle.load(fd) + if self.paths == tmp.paths: + logging.debug("Path lists match, copying properties") + # Overwrite this object with the other + for attr in ('list', 'imagePointer'): + setattr(self, attr, getattr(tmp, attr)) + else: + logging.debug("Ignoring cache, path lists do not match") + except Exception, e: + logging.warning("Loading cache", exc_info=1) + else: + return True + def get_current_image(self): return self.list[self.imagePointer] @@ -146,13 +181,13 @@ 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): @@ -167,25 +202,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: @@ -202,10 +239,10 @@ class Cycler(object): self.cycle_time = options.cycle_time self.history_filename = options.history_filename - debug("Initialising wallchanger") + logging.debug("Initialising wallchanger") wallchanger.init(options.background_colour, options.permanent) - debug("Initialising file list") + logging.debug("Initialising file list") if options.all_random: self.filelist = AllRandomFileList() elif options.folder_random: @@ -217,13 +254,13 @@ 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 @@ -245,7 +282,7 @@ 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) def cmd_reload(self): image = self.filelist.get_current_image() @@ -288,13 +325,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) @@ -340,7 +377,7 @@ 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()