try:
# Required libraries
import asyncsched
- import WallChanger
+ import wallchanger
except ImportError, e:
critical("Missing libraries! Exiting...")
sys.exit(1)
raise NotImplementedError()
def is_empty(self):
- return False
+ return True
class RandomFileList(BaseFileList):
return self.last_image
def is_empty(self):
- return len(self.list) > 0
+ return len(self.list) == 0
class AllRandomFileList(BaseFileList):
pickle.dump(obj = self, file = fd, protocol = 2)
debug("Cache successfully stored")
except Exception, e:
- warning("Exception while storing cache: '%s'" % e)
+ warning("Storing cache: %s" % e)
def load_cache(self, filename, rescanPaths = False):
debug('Attempting to load cache from "%s"' % filename)
else:
debug("Ignoring cache, path lists do not match")
except Exception, e:
- warning("Exception while loading cache: '%s'" % e)
+ warning("Loading cache: %s" % e)
def get_current_image(self):
return self.list[self.imagePointer]
return imageName
def is_empty(self):
- return self.list
+ return len(self.list) == 0
class FolderRandomFileList(BaseFileList):
"""A file list that will pick a file randomly within a directory. Each
def __init__(self):
self.directories = {}
+ def scan_paths(self):
+ pass
+
def add_path(self, path):
debug('Added path "%s" to the list' % path)
for dirpath, dirs, filenames in os.walk(path):
debug('Scanning "%s" for images' % dirpath)
if self.directories.has_key(dirpath):
continue
- filenames = filter_images(filenames)
+ filenames = list(filter_images(filenames))
if len(filenames):
self.directories[dirpath] = filenames
debug('Adding "%s" to "%s"' % (filenames, dirpath))
return os.path.join(directory, filename)
def is_empty(self):
- return len(self.directories.values())
+ return len(self.directories.values()) == 0
class Cycler(object):
- def __init__(self, options, paths):
- self.filelist = self.find_files(options, paths)
- if not self.filelist.is_empty():
- error("No images were found. Exiting...")
- sys.exit(1)
-
- debug("Initialising RandomBG")
- self.randombg = WallChanger.RandomBG(options.background_colour, options.permanent)
+ def init(self, options, paths):
self.cycle_time = options.cycle_time
+ self.history_filename = options.history_filename
- self.task = None
- self.cmd_next()
+ debug("Initialising wallchanger")
+ wallchanger.init(options.background_colour, options.permanent)
- def find_files(self, options, paths):
+ debug("Initialising file list")
if options.all_random:
- filelist = AllRandomFileList()
+ self.filelist = AllRandomFileList()
elif options.folder_random:
- filelist = FolderRandomFileList()
+ self.filelist = FolderRandomFileList()
else:
- filelist = RandomFileList()
+ self.filelist = RandomFileList()
for path in paths:
- filelist.add_path(path)
+ self.filelist.add_path(path)
- if filelist.load_cache(options.history_filename):
+ if self.filelist.load_cache(self.history_filename):
debug("Loaded cache successfully")
else:
debug("Could not load cache")
- filelist.scan_paths()
+ self.filelist.scan_paths()
+
+ if self.filelist.is_empty():
+ error("No images were found. Exiting...")
+ sys.exit(1)
+
+ self.task = None
+ self.cmd_next()
+
+ def finish(self):
+ self.filelist.store_cache(self.history_filename)
+
+ def find_files(self, options, paths):
return filelist
def cmd_reset(self):
def next():
image = self.filelist.get_next_image()
- self.randombg.setImage(image)
+ wallchanger.set_image(image)
self.task = None
self.cmd_reset()
def cmd_reload(self):
image = self.filelist.get_current_image()
- self.randombg.setImage(image)
+ wallchanger.set_image(image)
self.cmd_reset()
def cmd_next(self):
image = self.filelist.get_next_image()
- self.randombg.setImage(image)
+ wallchanger.set_image(image)
self.cmd_reset()
def cmd_prev(self):
image = self.filelist.get_prev_image()
- self.randombg.setImage(image)
+ wallchanger.set_image(image)
self.cmd_reset()
def cmd_rescan(self):
if self.task is not None:
self.task.cancel()
self.task = None
+
+ def cmd_exit(self):
+ asyncsched.exit()
class Server(asynchat.async_chat):
def __init__(self, cycler, conn, addr):
class Listener(asyncore.dispatcher):
- def __init__(self, socket_filename, randombg):
+ def __init__(self, socket_filename, cycler):
asyncore.dispatcher.__init__(self)
- self.randombg = randombg
+ self.cycler = cycler
self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.bind(socket_filename)
self.listen(2) # Backlog = 2
def handle_accept(self):
conn, addr = self.accept()
- Server(self.randombg, conn, addr)
+ Server(self.cycler, conn, addr)
+
+ def writable(self):
+ return False
def do_server(options, paths):
try:
+ cycler = Cycler()
+ listener = Listener(options.socket_filename, cycler)
+ # Initialisation of Cycler delayed so we grab the socket quickly
+ cycler.init(options, paths)
try:
- cycler = Cycler(options, paths)
- listener = Listener(options.socket_filename, cycler)
asyncsched.loop()
except KeyboardInterrupt:
print
+ cycler.finish()
finally:
# Make sure that the socket is cleaned up
try:
time.sleep(options.cycle_time)
sock.close()
+def do_oneshot(options, paths):
+ cycler = Cycler()
+ cycler.init(options, paths)
def build_parser():
parser = OptionParser(version="%prog " + VERSION,
parser.add_option("--all-random",
action="store_true", dest="all_random", default=False,
help="Make sure that all images have been displayed before repeating an image")
+ parser.add_option("-1", "--oneshot",
+ action="store_true", dest="oneshot", default=False,
+ help="Set one random image and terminate immediately.")
parser.add_option("--folder-random",
action="store_true", dest="folder_random", default=False,
help="Give each folder an equal chance of having an image selected from it")
+ parser.add_option("--convert",
+ action="store_true", dest="convert", default=False,
+ help="Do conversions using ImageMagick or PIL, don't rely on the window manager")
parser.add_option("--cycle-time",
action="store", type="int", default=1800, dest="cycle_time",
help="Cause the image to cycle every X seconds")
parser.add_option("--socket",
- action="store", type="string", dest="socket_filename", default=os.path.expanduser('~/tmp/tmp_socket'),
+ action="store", type="string", dest="socket_filename", default=os.path.expanduser('~/.randombg_socket'),
help="Location of the command/control socket.")
parser.add_option("--history-file",
action="store", type="string", dest="history_filename", default=os.path.expanduser('~/.randombg_historyfile'),
parser = build_parser()
options, args = parser.parse_args(sys.argv[1:])
- logging.basicConfig(level=10*options.verbose)
+ if options.verbose == 1:
+ logging.getLogger().setLevel(logging.INFO)
+ elif options.verbose >= 2:
+ logging.getLogger().setLevel(logging.DEBUG)
+
+ if options.oneshot:
+ do_oneshot(options, args)
if os.path.exists(options.socket_filename):
do_client(options, args)