Convert the filename to unicode (to split by characters, not bytes).

[xsetbg.git] / xsetbg.py

diff --git a/xsetbg.py b/xsetbg.py
index 3b3b02f045c109a13c69141bcffb625ece9cff14..c2b994887464a2d6a700ee1ebdeea67080c7fb91 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -1,16 +1,19 @@
-#! /usr/local/bin/python -O
-"""Select a random image from $HOME/lib/xsetbg/images subdirectories
-and set it as the desktop wallpaper (display it in the root window).
+#! /usr/bin/env python
+"""Set a random background image (XWin)
+
+Select a random image from a (list of) directory(s)
+and set it as the desktop wallpaper (display it in the root window)
+using xli or xsetbg programs.
 
-Author: Oleg BroytMann <phd@phd.pp.ru>
-Copyright (C) 2000-2006 PhiloSoft Design
 """
 
 __version__ = "$Revision$"[11:-2]
+__revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+
 __author__ = "Oleg BroytMann <phd@phd.pp.ru>"
 __copyright__ = "Copyright (C) 2000-2006 PhiloSoft Design"
-__date__ = "$Date$"[7:-2]
-__revision__ = "$Id$"[5:-2]
+__license__ = "GNU GPL"
 
 
 import sys, os
@@ -105,6 +108,12 @@ os.umask(0066) # octal; -rw-------; make the global persistent dictionary
 global_db_name = "xsetbg.db"
 
 
+# DB keys
+timestamp_key = "timestamp"
+filename_key = "filename"
+old_filename_key = "old_filename"
+
+
 import random
 import anydbm, shelve
 from time import time
@@ -121,13 +130,21 @@ except anydbm.error, msg:
       os.remove(global_db_name)
       global_db = shelve.open(global_db_name, flag='c')
 
-global_db.close() # Close DB in parent process
+# Remove old filenames
+old_time = time() - min_delay
 
+to_delete = [timestamp_key]
+for key in global_db.keys():
+   if key.startswith('/') and global_db[key] < old_time:
+      to_delete.append(key)
 
-# DB keys
-timestamp_key = "timestamp"
-filename_key = "filename"
-old_filename_key = "old_filename"
+for key in to_delete:
+   try:
+      del global_db[key]
+   except KeyError:
+      pass
+
+global_db.close() # Close DB in the parent process
 
 
 images = []