X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/fce0bb0219e37c43dace3b4eb02d5274a636d518..f6fd0f461b4b1ec453e7f84d0e262e1f34a7907f:/randombg.py

diff --git a/randombg.py b/randombg.py
index a6fb4f0..00c7d54 100755
--- a/randombg.py
+++ b/randombg.py
@@ -49,7 +49,7 @@ class BaseFileList(object):
 		try:
 			logging.debug("Attempting to store cache")
 			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:
 			warning("Storing cache: %s" % e)
@@ -65,10 +65,11 @@ 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)
 
@@ -162,24 +163,6 @@ class AllRandomFileList(BaseFileList):
 		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', '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]
 	
@@ -203,6 +186,7 @@ class AllRandomFileList(BaseFileList):
 	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."""
@@ -245,12 +229,12 @@ 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
 
 		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:
@@ -274,7 +258,10 @@ class Cycler(object):
 			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)
@@ -293,6 +280,7 @@ class Cycler(object):
 			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()
@@ -347,7 +335,6 @@ class Server(asynchat.async_chat):
 			logging.debug('Unknown command received "%s"' % cmd)
 
 
-
 class Listener(asyncore.dispatcher):
 	def __init__(self, socket_filename, cycler):
 		asyncore.dispatcher.__init__(self)
@@ -396,7 +383,7 @@ def do_client(options, args):
 
 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, 
@@ -449,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()
-