X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=print-filename.py;h=d664d79d360d32b1d92422ae79e9157ff7459db3;hb=65ff4c2e85b037a673c282b02ffa2db10c7eebd3;hp=72769b1a591245789db184c88f1a1f3dedcdf7fe;hpb=661f084ccb18819bc9bf0060226f4009a83797cf;p=xsetbg.git

diff --git a/print-filename.py b/print-filename.py
index 72769b1..d664d79 100755
--- a/print-filename.py
+++ b/print-filename.py
@@ -1,21 +1,26 @@
-#! /usr/local/bin/python -O
-"""This file is a part of XSetBg.
-Author: Oleg BroytMann <phd@phd.pp.ru>
-Copyright (C) 2004-2006 PhiloSoft Design
+#! /usr/bin/env python
+"""Print background filename
+
+Print the filename of the current or previous background image.
+
+This file is a part of XSetBg.
+
 """
 
 __version__ = "$Revision$"[11:-2]
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2004-2006 PhiloSoft Design"
-__date__ = "$Date$"[7:-2]
 __revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+
+__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
+__copyright__ = "Copyright (C) 2004-2007 PhiloSoft Design"
+__license__ = "GNU GPL"
 
 
 import sys, os, shelve
 
 
 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 [-0|--null] [-n|--no-newline] [-o|--old] [-s|--spaces] [-w|--width] [width]\n" % sys.argv[0])
    sys.exit(code)
 
 
@@ -23,12 +28,13 @@ 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:], "0nosw:",
+         ["null", "no-newline", "old", "spaces", "width="])
    except GetoptError:
       usage(1)
 
    print0 = False
+   newline = True
    old = False
    spaces = ''
    width = None
@@ -38,6 +44,8 @@ def get_args():
          usage()
       elif option in ("-0", "--null"):
          print0 = True
+      elif option in ("-n", "--no-newline"):
+         newline = False
       elif option in ("-o", "--old"):
          old = True
       elif option in ("-s", "--spaces"):
@@ -55,9 +63,9 @@ def get_args():
       else:
          width = int(arguments[0])
 
-   return print0, old, spaces, width
+   return print0, newline, old, spaces, width
 
-print0, old, spaces, width = get_args()
+print0, newline, old, spaces, width = get_args()
 
 
 xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
@@ -76,20 +84,21 @@ else:
 filename = global_db[key]
 global_db.close()
 
+from m_lib.defenc import default_encoding
+filename = unicode(filename, default_encoding)
 
 if width:
    lines = []
    while filename:
       lines.append("%s%s%s" % (spaces, filename[:width], spaces))
       filename = filename[width:]
-   filename = "\n".join(lines)
+   filename = u'\n'.join(lines)
 else:
-   filename = "%s%s%s" % (spaces, filename, spaces)
+   filename = u"%s%s%s" % (spaces, filename, spaces)
 
-
-sys.stdout.write(filename)
+sys.stdout.write(filename.encode(default_encoding))
 
 if print0:
    sys.stdout.write('\0')
-else:
+elif newline:
    print