Automated merge with ssh://hg@kagami.tsukasa.net.au/bg_scripts/

[bg-scripts] / randombg.py

diff --git a/randombg.py b/randombg.py
index e58875ade1a623c5563a49655d3e1699b92c61ae..d069b4983c990b358e1639af2de4d01d7fe33d6f 100755 (executable)
--- a/randombg.py
+++ b/randombg.py
@@ -33,17 +33,47 @@ def filter_images(filenames):
 
 class BaseFileList(object):
        """Base file list implementation"""
-       def scan_paths(self):
-               raise NotImplementedError()
+       def __init__(self):
+               self.paths = []
 
        def add_path(self, path):
-               raise NotImplementedError()
+               self.paths.append(path)
 
-       def store_cache(self, path):
-               pass
+       def store_cache(self, filename):
+               try:
+                       debug("Attempting to store cache")
+                       fd = open(filename, 'wb')
+                       pickle.dump(obj = self, file = fd, protocol = 2)
+                       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:
+                       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:
+                       warning("Loading cache: %s" % e)
+                       return False
+
+       def scan_paths(self):
+               raise NotImplementedError()
 
        def get_next_image(self):
                raise NotImplementedError()
@@ -60,8 +90,8 @@ class BaseFileList(object):
 
 class RandomFileList(BaseFileList):
        def __init__(self):
+               super(RandomFileList, self).__init__()
                self.list = []
-               self.paths = []
                self.last_image = None
 
        def scan_paths(self):
@@ -80,14 +110,20 @@ class RandomFileList(BaseFileList):
                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
@@ -161,7 +197,9 @@ class FolderRandomFileList(BaseFileList):
        """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
@@ -186,6 +224,12 @@ class FolderRandomFileList(BaseFileList):
                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
 
@@ -257,7 +301,6 @@ class Cycler(object):
        
        def cmd_rescan(self):
                self.filelist.scan_paths()
-               self.cmd_next()
        
        def cmd_pause(self):
                if self.task is not None: