X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=print-filename.py;h=1a448d345b62eabc45a95cd76aa9ef3f34896809;hb=18151a095e176678f48555b53083c96c2b995501;hp=91088c25a5752e690d43c0a571f8ed056f757550;hpb=46d5dc4e5b2f0ce71dc89d537c0756526cdfe5d1;p=xsetbg.git

diff --git a/print-filename.py b/print-filename.py
index 91088c2..1a448d3 100755
--- a/print-filename.py
+++ b/print-filename.py
@@ -8,72 +8,61 @@ This file is a part of XSetBg.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
-import sys, os, shelve
+import sys
+from xsetbg_db import xsetbg_db
+
+if not xsetbg_db:
+    sys.exit("Error: no database found")
 
 
 def usage(code=0):
-   sys.stderr.write("Usage: %s [-o|--old]\n" % sys.argv[0])
-   sys.exit(code)
+    sys.stderr.write("Usage: %s [-o|--old]\n" % sys.argv[0])
+    sys.exit(code)
 
 
 def get_args():
-   from getopt import getopt, GetoptError
-
-   try:
-      options, arguments = getopt(sys.argv[1:], "he:o",
-                                  ["help", "output-encoding=", "old"])
-   except GetoptError:
-      usage(1)
-
-   old = False
-   output_encoding = None
-
-   for option, value in options:
-      if option in ("-h", "--help"):
-         usage()
-      elif option in ("-e", "--output-encoding"):
-         output_encoding = value
-      elif option in ("-o", "--old"):
-         old = True
-      else:
-         usage(2)
-
-   if arguments:
-      usage(3)
-
-   if output_encoding is None:
-      from m_lib.defenc import default_encoding
-      output_encoding = default_encoding
-   return old, output_encoding
+    from getopt import getopt, GetoptError
+
+    try:
+        options, arguments = getopt(sys.argv[1:], "he:o",
+                                    ["help", "output-encoding=", "old"])
+    except GetoptError:
+        usage(1)
+
+    old = False
+    output_encoding = None
+
+    for option, value in options:
+        if option in ("-h", "--help"):
+            usage()
+        elif option in ("-e", "--output-encoding"):
+            output_encoding = value
+        elif option in ("-o", "--old"):
+            old = True
+        else:
+            usage(2)
+
+    if arguments:
+        usage(3)
+
+    if output_encoding is None:
+        from m_lib.defenc import default_encoding
+        output_encoding = default_encoding
+    return old, output_encoding
 
 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
+    index = 1
 else:
-   key = filename_key
-filename = global_db[key]
-global_db.close()
-
-from ConfigParser import SafeConfigParser
-config = SafeConfigParser()
-config.read("xsetbg.conf")
+    index = 0
 
-fs_encoding = config.get("images", "fs_encoding")
-filename = unicode(filename, fs_encoding)
+filename = xsetbg_db.select('last_shown IS NOT NULL',
+                            orderBy='-last_shown')[index].full_name
 
 print filename.encode(output_encoding)