From 83b3109fa77a22404533518484e73c0c6c193712 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 22 Jul 2015 21:07:53 +0300 Subject: [PATCH] Convert print-filename.py --- print-filename.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/print-filename.py b/print-filename.py index 6348f68..47fda4a 100755 --- a/print-filename.py +++ b/print-filename.py @@ -8,14 +8,16 @@ This file is a part of XSetBg. """ __author__ = "Oleg Broytman " -__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) -- 2.39.5