X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg_db.py;h=c6a8a3fece4c4a0699cffdeb7372829cfd2d95df;hb=80c5a31f64e2722657d472191b52589210b7f0d8;hp=4853afb8f75ba90a2c142020ccd60e84034bd36b;hpb=a337e26c169baecb75197b50db5fd734c39f6187;p=xsetbg.git

diff --git a/xsetbg_db.py b/xsetbg_db.py
index 4853afb..c6a8a3f 100755
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -7,16 +7,39 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-__all__ = ['xsetbg_db']
+__all__ = ['xsetbg_db_path', 'xsetbg_db']
 
 import anydbm
 import os
 import shelve
-from xsetbg_conf import xsetbg_dir, xsetbg_conf
+from xsetbg_conf import xsetbg_conf
 
-xsetbg_db_name = "xsetbg.db"
+db_dirs = []
+try:
+    xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
+except:
+    xsetbg_db_path = None
+
+if not xsetbg_db_path:
+    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:
+        xsetbg_db_path = os.path.join(d, 'xsetbg.db')
+        if os.path.exists(xsetbg_db_path):
+            break
+    else:
+        raise RuntimeError("Cannot find xsetbg.db; searched %s", db_dirs)
 
 try:
-    xsetbg_db = shelve.open(os.path.join(xsetbg_dir, xsetbg_db_name), 'r')
+    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:", xsetbg_db_path