]> code.delx.au - bg-scripts/commitdiff
Cleaned up the logging code (we now use the full module name)
authorGreg Darke <greg@tsukasa.net.au>
Mon, 7 Jul 2008 06:15:22 +0000 (16:15 +1000)
committerGreg Darke <greg@tsukasa.net.au>
Mon, 7 Jul 2008 06:15:22 +0000 (16:15 +1000)
randombg.py
wallchanger.py

index c20dd408a03bde27927047e2d1e8391f837fe843..3f1609cba2cc7957694130a4b5aaba59c36939b9 100755 (executable)
@@ -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)
 
 
@@ -73,12 +72,12 @@ class RandomFileList(BaseFileList):
 
        def add_path(self, path):
                self.paths.append(path)
-               debug('Added path "%s" to the list' % 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 is_empty(self):
@@ -93,45 +92,45 @@ class AllRandomFileList(BaseFileList):
 
        # Scan the input directory, and then randomize the file list
        def scan_paths(self):
-               debug("Scanning paths")
+               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)
-               debug('Added path "%s" to the list' % 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)
-                       debug("Cache successfully stored")
+                       logging.debug("Cache successfully stored")
                except Exception, e:
-                       warning("Storing cache: %s" % e)
+                       logging.warning("Storing cache", exc_info=1)
 
        def load_cache(self, filename, rescanPaths = False):
-               debug('Attempting to load cache from "%s"' % filename)
+               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:
-                               debug("Path lists match, copying properties")
+                               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:
-                               debug("Ignoring cache, path lists do not match")
+                               logging.debug("Ignoring cache, path lists do not match")
                except Exception, e:
-                       warning("Loading cache: %s" % e)
+                       logging.warning("Loading cache", exc_info=1)
 
        def get_current_image(self):
                return self.list[self.imagePointer]
@@ -144,13 +143,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):
@@ -166,23 +165,23 @@ class FolderRandomFileList(BaseFileList):
                pass
        
        def add_path(self, path):
-               debug('Added path "%s" to the list' % path)
+               logging.debug('Added path "%s" to the list' % path)
                for dirpath, dirs, filenames in os.walk(path):
-                       debug('Scanning "%s" for images' % dirpath)
+                       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
-                               debug('Adding "%s" to "%s"' % (filenames, dirpath))
+                               logging.debug('Adding "%s" to "%s"' % (filenames, dirpath))
                        else:
-                               debug("No images found in '%s'" % dirpath)
+                               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)
+               logging.debug('filename: "%s"' % filename)
                return os.path.join(directory, filename)
        
        def is_empty(self):
@@ -194,10 +193,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:
@@ -209,13 +208,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
@@ -237,7 +236,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()
@@ -281,13 +280,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)
 
 
 
index b20c0683b84404326f3afd5f2b1fdc27d639a74b..6509d8fbbd909ed46fe44e6d3164c8d1c0705b49 100755 (executable)
@@ -5,7 +5,7 @@
 # This is a cross platform/cross window manager way to change your wallpaper
 
 import commands, sys, os, os.path, subprocess, time
-from logging import debug, info, warning
+import logging
 
 __all__ = ("init", "set_image")
 
@@ -13,15 +13,15 @@ __all__ = ("init", "set_image")
 changers = []
 
 def set_image(filename):
-       info("Setting image: %s" % filename)
+       logging.info("Setting image: %s", filename)
        for changer in changers:
                if not changer.set_image(filename):
-                       warning("Failed to set background: wallchanger.set_image(%s), changer=%s" % (filename, changer))
+                       logging.warning("Failed to set background: wallchanger.set_image(%s), changer=%s", filename, changer)
 
 def init(*args, **kwargs):
        """Desktop Changer factory"""
 
-       debug("Testing for OSX (NonX11)")
+       logging.debug("Testing for OSX (NonX11)")
        if commands.getstatusoutput("ps ax -o command -c|grep -q WindowServer")[0] == 0:
                changers.append(OSXChanger(*args, **kwargs))
 
@@ -35,15 +35,15 @@ def init(*args, **kwargs):
                                # X11 is not running for this display
                                return
 
-       debug("Testing for KDE")
+       logging.debug("Testing for KDE")
        if commands.getstatusoutput("xwininfo -name 'KDE Desktop'")[0] == 0:
                changers.append(KDEChanger(*args, **kwargs))
 
-       debug("Testing for Gnome")
+       logging.debug("Testing for Gnome")
        if commands.getstatusoutput("xwininfo -name 'gnome-session'")[0] == 0:
                changers.append(GnomeChanger(*args, **kwargs))
 
-       debug("Testing for WMaker")
+       logging.debug("Testing for WMaker")
        if commands.getstatusoutput("xlsclients | grep -qi wmaker")[0] == 0:
                changers.append(WMakerChanger(*args, **kwargs))
        
@@ -54,7 +54,7 @@ def init(*args, **kwargs):
 class BaseChanger(object):
        name = "undefined"
        def __init__(self, background_color='black', permanent=False, convert=False):
-               info('Determined the window manager is "%s"' % self.name)
+               logging.info('Determined the window manager is "%s"', self.name)
                self.background_color = background_color
                self.permanent = permanent
                self.convert = convert
@@ -80,14 +80,14 @@ class WMakerChanger(BaseChanger):
                self.remove_old_image_cache()
                output_name = os.path.join(self._ConvertedWallpaperLocation, '%s.png' % time.time())
                cmd = ["convert", '-resize', '1280', '-gravity', 'Center', '-crop', '1280x800+0+0', file, output_name]
-               debug("""Convert command: '"%s"'""" % '" "'.join(cmd))
+               logging.debug("""Convert command: '"%s"'""", '" "'.join(cmd))
                return output_name, subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait()
 
        def set_image(self, file):
                if self.convert:
                        file, convert_status = self.convert_image_format(file)
                        if convert_status:
-                               debug('Convert failed')
+                               logging.debug('Convert failed')
                cmd = ["wmsetbg", 
                        "-b", self.background_color, # Sets the background colour to be what the user specified
                        "-S", # 'Smooth' (WTF?)
@@ -99,7 +99,7 @@ class WMakerChanger(BaseChanger):
                if self.permanent:
                        cmd += ["-u"] # update the wmaker database
                cmd += [file]
-               debug('''WMaker bgset command: "'%s'"''' % "' '".join(cmd))
+               logging.debug('''WMaker bgset command: "'%s'"''', "' '".join(cmd))
                return not subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait()
 
 class OSXChanger(BaseChanger):
@@ -131,7 +131,7 @@ class OSXChanger(BaseChanger):
                        img.save(output_name, "PNG")
                        return output_name, True
                except ImportError:
-                       debug('Could not load PIL, going to try just copying the image')
+                       logging.debug('Could not load PIL, going to try just copying the image')
                        import shutil
                        output_name = os.path.join(self._ConvertedWallpaperLocation, os.path.basename(file))
                        shutil.copyfile(file, output_name)
@@ -150,23 +150,23 @@ class OSXChanger(BaseChanger):
                        # Store the plist again (Make sure we write it out atomically -- Don't want to break finder)
                        desktop_plist.writeToFile_atomically_(self._DesktopPlistLocation, True)
                except ImportError:
-                       debug('Could not import the Foundation module, you may have problems with dual screens')
+                       logging.debug('Could not import the Foundation module, you may have problems with dual screens')
 
        def set_image(self, filename):
                if self.convert:
                        filename, ret = self.convert_image_format(filename)
                        if not ret:
-                               debug("Convert failed")
+                               logging.debug("Convert failed")
                                return False
                cmd = """osascript -e 'tell application "finder" to set desktop picture to posix file "%s"'""" % filename
-               debug(cmd)
+               logging.debug(cmd)
                return not commands.getstatusoutput(cmd)[0]
 
 class GnomeChanger(BaseChanger):
        name = "Gnome"
        def set_image(self, file):
                cmd = ['gconftool-2', '--type', 'string', '--set', '/desktop/gnome/background/picture_filename', file]
-               debug(cmd)
+               logging.debug(cmd)
                return not subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait()
 
 class KDEChanger(BaseChanger):
@@ -182,7 +182,7 @@ class KDEChanger(BaseChanger):
 
                cmds.append(['dcop', 'kdesktop', 'KBackgroundIface', 'configure'])
                for cmd in cmds:
-                       debug(cmd)
+                       logging.debug(cmd)
                        if subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait() != 0:
                                return False
 
@@ -190,7 +190,6 @@ class KDEChanger(BaseChanger):
 
 
 def main(filename):
-       import logging
        logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s")
        init()
        set_image(filename)