Search xsetbg.db in XDG directories

Search xsetbg.db in $XDG_CACHE_HOME or $HOME/.cache.

diff --git a/TODO b/TODO
index 55e0360e02a459a8cf36a0ccf29df3d6256c5103..ab4c743f03c3ec6d6e0a0db3ee02ea6899d4ebeb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-Move xsetbg.db to $XDG_CACHE_HOME or $HOME/.cache.
-
-
 Serialized list of images for faster starting.
 
 

diff --git a/xsetbg.conf.pat b/xsetbg.conf.pat
index d515443372cb12eb61266c3acd76fb657acce35c..4c8eaf40d6b515803d473dfe190e5807e0eab5bf 100644 (file)
--- a/xsetbg.conf.pat
+++ b/xsetbg.conf.pat
@@ -7,7 +7,7 @@ host = localhost
 port = 7999
 
 [xsetbg]
-database = ~/lib/xsetbg/xsetbg.db
+; database = ~/.cache/xsetbg.db
 
 ; minimum time in seconds between background image changes
 min_pause = 300 ; (5 minutes)

diff --git a/xsetbg_db.py b/xsetbg_db.py
old mode 100644 (file)
new mode 100755 (executable)
index 54bc62e..c335168
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -1,3 +1,4 @@
+#! /usr/bin/env python
 """XSetBg database
 
 """
@@ -13,9 +14,34 @@ import os
 import shelve
 from xsetbg_conf import xsetbg_conf
 
-xsetbg_db_path = os.path.expanduser(xsetbg_conf.get('xsetbg', 'database'))
+db_dirs = []
+try:
+    db_file = xsetbg_conf.get('xsetbg', 'database')
+except:
+    db_file = None
+
+if not db_file:
+    if 'XDG_CACHE_HOME' in os.environ:
+        db_dirs.append(os.environ['XDG_CACHE_HOME'])
+    home_cache = os.path.expanduser('~/.cache')
+    if home_cache not in db_dirs:
+        db_dirs.append(home_cache)
+    db_dirs.append(os.path.dirname(os.path.abspath(__file__)))
+
+    for d in db_dirs:
+        db_file = os.path.join(d, 'xsetbg.db')
+        if os.path.exists(db_file):
+            break
+    else:
+        raise RuntimeError("Cannot find xsetbg.db; searched %s", db_dirs)
+
+xsetbg_db_path = db_file
 
 try:
     xsetbg_db = shelve.open(xsetbg_db_path, 'r')
 except anydbm.error:
     xsetbg_db = None
+
+if __name__ == '__main__':
+    print "DB dirs:", db_dirs
+    print "DB file:", db_file