Convert print-filename.py

diff --git a/print-filename.py b/print-filename.py
index 6348f68693cce5c2015ea4eabbef259c048ba0d1..47fda4a64f9304bd29ad7cfd0fcc4ee2eb4d5237 100755 (executable)
--- a/print-filename.py
+++ b/print-filename.py
@@ -8,14 +8,16 @@ This file is a part of XSetBg.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
-import sys, os
-from xsetbg_conf import xsetbg_conf
+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])
@@ -55,18 +57,12 @@ def get_args():
 old, output_encoding = get_args()
 
 
-filename_key = "filename"
-old_filename_key = "old_filename"
-
 if old:
-   key = old_filename_key
+   index = 1
 else:
-   key = filename_key
-
-filename = xsetbg_db[key]
-xsetbg_db.close()
+   index = 0
 
-fs_encoding = xsetbg_conf.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)