import os, os.path, random, sys, time
from optparse import OptionParser
import logging
-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:
import asyncsched
import wallchanger
except ImportError, e:
- logging.critical("Missing libraries! Exiting...")
+ logging.critical("Missing libraries! Exiting...", exc_info=1)
sys.exit(1)
class BaseFileList(object):
"""Base file list implementation"""
- def scan_paths(self):
- raise NotImplementedError()
+ def __init__(self):
+ self.paths = []
+ self.favourites = []
def add_path(self, path):
- raise NotImplementedError()
+ self.paths.append(path)
- def store_cache(self, path):
- pass
+ def store_cache(self, filename):
+ try:
+ logging.debug("Attempting to store cache")
+ fd = open(filename, 'wb')
+ pickle.dump(self, fd, 2)
+ logging.debug("Cache successfully stored")
+ except Exception, e:
+ warning("Storing cache: %s" % e)
- def load_cache(self, filename, rescanPaths = False):
- pass
+ def load_cache(self, filename):
+ try:
+ logging.debug("Attempting to load cache from: %s" % filename)
+ self.paths.sort()
+
+ fd = open(filename, 'rb')
+ tmp = pickle.load(fd)
+
+ 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")
+
+ for attr, value in tmp.__dict__.items():
+ setattr(self, attr, value)
+
+ return True
+
+ except Exception, 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()
def get_next_image(self):
raise NotImplementedError()
class RandomFileList(BaseFileList):
def __init__(self):
+ super(RandomFileList, self).__init__()
self.list = []
- self.paths = []
self.last_image = None
def scan_paths(self):
logging.debug("Picked file '%s' from list" % self.last_image)
return self.last_image
+ def get_current_image(self):
+ if self.last_image:
+ return self.last_image
+ else:
+ return self.get_next_image()
+
def is_empty(self):
return len(self.list) == 0
class AllRandomFileList(BaseFileList):
def __init__(self):
+ super(AllRandomFileList, self).__init__()
self.list = None
- self.paths = []
self.imagePointer = 0
# Scan the input directory, and then randomize the file list
def store_cache(self, filename):
try:
fd = open(filename, 'wb')
- pickle.dump(obj = self, file = fd, protocol = 2)
+ pickle.dump(self, fd, 2)
logging.debug("Cache successfully stored")
except Exception, e:
logging.warning("Storing cache", exc_info=1)
if self.paths == tmp.paths:
logging.debug("Path lists match, copying properties")
# Overwrite this object with the other
- for attr in ('list', 'imagePointer'):
+ for attr in ('list', 'imagePointer', 'favourites'):
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]
"""A file list that will pick a file randomly within a directory. Each
directory has the same chance of being chosen."""
def __init__(self):
+ super(FolderRandomFileList, self).__init__()
self.directories = {}
+ self.last_image = None
def scan_paths(self):
pass
logging.debug('filename: "%s"' % filename)
return os.path.join(directory, filename)
+ def get_current_image(self):
+ if self.last_image:
+ return self.last_image
+ else:
+ return self.get_next_image()
+
def is_empty(self):
return len(self.directories.values()) == 0
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
logging.debug("Initialising wallchanger")
- wallchanger.init(options.background_colour, options.permanent)
+ wallchanger.init(options.background_colour, options.permanent, options.convert)
logging.debug("Initialising file list")
if options.all_random:
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)
self.task.cancel()
self.task = asyncsched.schedule(self.cycle_time, next)
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()
def cmd_rescan(self):
self.filelist.scan_paths()
- self.cmd_next()
def cmd_pause(self):
if self.task is not None:
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)
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,
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__":