X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/a2686cb1eada91d486acc4bbebe57d321fcaa525..9bbea708782fc721666590c03c36f574cbb3e756:/wallchanger.py

diff --git a/wallchanger.py b/wallchanger.py
index fa1c5d0..4ee3b08 100755
--- a/wallchanger.py
+++ b/wallchanger.py
@@ -6,6 +6,10 @@
 
 import commands, sys, os, os.path, time
 import logging
+try:
+	import PIL, PIL.Image
+except ImportError:
+	PIL = None
 
 __all__ = ("init", "set_image")
 
@@ -43,6 +47,10 @@ def init(*args, **kwargs):
 	if commands.getstatusoutput("xwininfo -name 'KDE Desktop'")[0] == 0:
 		changers.append(KDEChanger(*args, **kwargs))
 
+	logging.debug("Testing for Unity")
+	if commands.getstatusoutput("xlsclients | grep -qi unity")[0] == 0:
+		changers.append(UnityChanger(*args, **kwargs))
+
 	logging.debug("Testing for Gnome")
 	if commands.getstatusoutput("xwininfo -name 'gnome-settings-daemon'")[0] == 0:
 		changers.append(GnomeChanger(*args, **kwargs))
@@ -84,7 +92,12 @@ class BaseChanger(object):
 
 	def convert_image_format(self, filename, format='BMP', allowAlpha=False, extension='.bmp'):
 		"""Convert the image to another format, and store it in a local place"""
-		import PIL, PIL.Image
+		if not os.path.exists(filename):
+			logger.warn('The input file "%s" does not exist, so it will not be converted', filename)
+			return filename, False
+		if PIL is None:
+			logger.warn('PIL could not be found, not converting image format')
+			return filename, False
 
 		self.remove_old_image_cache()
 		output_name = os.path.join(self._ConvertedWallpaperLocation, '%s%s' % (time.time(), extension))
@@ -245,6 +258,13 @@ class GnomeChanger(BaseChanger):
 		logging.debug(cmd)
 		return not self._runProgram(cmd)
 
+class UnityChanger(BaseChanger):
+	name = "Unity"
+	def set_image(self, file):
+		cmd = ['gsettings', 'set', 'org.gnome.desktop.background', 'picture-uri', 'file://'+file]
+		logging.debug(cmd)
+		return not self._runProgram(cmd)
+
 class KDEChanger(BaseChanger):
 	name = "KDE"
 	def set_image(self, file):