X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=print-filename.py;h=6348f68693cce5c2015ea4eabbef259c048ba0d1;hb=21192b521520392055185f65e5764800edb41f32;hp=a710a939203b373fa8cd6ef0d24d4f8ea8396cca;hpb=eeb09e886cad6befca5aeab03772517e74541525;p=xsetbg.git

diff --git a/print-filename.py b/print-filename.py
index a710a93..6348f68 100755
--- a/print-filename.py
+++ b/print-filename.py
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 """Print background filename
 
 Print the filename of the current or previous background image.
@@ -7,20 +7,18 @@ This file is a part of XSetBg.
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2004-2006 PhiloSoft Design"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__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):
-   sys.stderr.write("Usage: %s [-0|--null] [-o|--old] [-s|--spaces] [-w|--width] [width]\n" % sys.argv[0])
+   sys.stderr.write("Usage: %s [-o|--old]\n" % sys.argv[0])
    sys.exit(code)
 
 
@@ -28,73 +26,47 @@ def get_args():
    from getopt import getopt, GetoptError
 
    try:
-      options, arguments = getopt(sys.argv[1:], "0osw:",
-         ["null", "old", "spaces", "width="])
+      options, arguments = getopt(sys.argv[1:], "he:o",
+                                  ["help", "output-encoding=", "old"])
    except GetoptError:
       usage(1)
 
-   print0 = False
    old = False
-   spaces = ''
-   width = None
+   output_encoding = None
 
    for option, value in options:
       if option in ("-h", "--help"):
          usage()
-      elif option in ("-0", "--null"):
-         print0 = True
+      elif option in ("-e", "--output-encoding"):
+         output_encoding = value
       elif option in ("-o", "--old"):
          old = True
-      elif option in ("-s", "--spaces"):
-         spaces = ' '
-      elif option in ("-w", "--width"):
-         width = int(value)
       else:
          usage(2)
 
    if arguments:
-      if width is not None:
-         usage(3)
-      elif len(arguments) > 1:
-         usage(4)
-      else:
-         width = int(arguments[0])
+      usage(3)
 
-   return print0, old, spaces, width
+   if output_encoding is None:
+      from m_lib.defenc import default_encoding
+      output_encoding = default_encoding
+   return old, output_encoding
 
-print0, old, spaces, width = 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()
 
+filename = xsetbg_db[key]
+xsetbg_db.close()
 
-if width:
-   lines = []
-   while filename:
-      lines.append("%s%s%s" % (spaces, filename[:width], spaces))
-      filename = filename[width:]
-   filename = "\n".join(lines)
-else:
-   filename = "%s%s%s" % (spaces, filename, spaces)
-
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
+filename = unicode(filename, fs_encoding)
 
-sys.stdout.write(filename)
-
-if print0:
-   sys.stdout.write('\0')
-else:
-   print
+print filename.encode(output_encoding)