Open config in xsetbg_conf.py, open db in xsetbg_db.py

[xsetbg.git] / print-filename.py

diff --git a/print-filename.py b/print-filename.py
index 91088c25a5752e690d43c0a571f8ed056f757550..6348f68693cce5c2015ea4eabbef259c048ba0d1 100755 (executable)
--- a/print-filename.py
+++ b/print-filename.py
@@ -8,11 +8,13 @@ This file is a part of XSetBg.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
-import sys, os, shelve
+import sys, os
+from xsetbg_conf import xsetbg_conf
+from xsetbg_db import xsetbg_db
 
 
 def usage(code=0):
@@ -53,27 +55,18 @@ def get_args():
 old, output_encoding = get_args()
 
 
-xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
-os.chdir(xsetbg_dir)
-
-global_db_name = "xsetbg.db"
 filename_key = "filename"
 old_filename_key = "old_filename"
 
-
-global_db = shelve.open(global_db_name, flag='r')
 if old:
    key = old_filename_key
 else:
    key = filename_key
-filename = global_db[key]
-global_db.close()
 
-from ConfigParser import SafeConfigParser
-config = SafeConfigParser()
-config.read("xsetbg.conf")
+filename = xsetbg_db[key]
+xsetbg_db.close()
 
-fs_encoding = config.get("images", "fs_encoding")
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
 filename = unicode(filename, fs_encoding)
 
 print filename.encode(output_encoding)