X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=print-filename.py;h=7a5f7543eb9978065c85a31cbad8038d10e70851;hb=607d025447e65d9b1cb2f465b6df42c983b86f94;hp=2712ec10ffaa546b1d3938f51ee6a48798c3f04d;hpb=52bbc04408504708b97dcde0411859acc7882c98;p=xsetbg.git

diff --git a/print-filename.py b/print-filename.py
index 2712ec1..7a5f754 100755
--- a/print-filename.py
+++ b/print-filename.py
@@ -1,19 +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]
+__revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+
 __author__ = "Oleg BroytMann <phd@phd.pp.ru>"
 __copyright__ = "Copyright (C) 2004-2006 PhiloSoft Design"
-__date__ = "$Date$"[7:-2]
-__revision__ = "$Id$"[5:-2]
+__license__ = "GNU GPL"
+
 
 import sys, os, shelve
 
+
 def usage(code=0):
-   sys.stderr.write("Usage: %s [-0|--null] [-o|--old] [-w|--width] [width]\n" % sys.argv[0])
+   sys.stderr.write("Usage: %s [-0|--null] [-o|--old] [-s|--spaces] [-w|--width] [width]\n" % sys.argv[0])
    sys.exit(code)
 
 
@@ -21,13 +28,14 @@ def get_args():
    from getopt import getopt, GetoptError
 
    try:
-      options, arguments = getopt(sys.argv[1:], "0ow:",
-         ["null", "old", "width="])
+      options, arguments = getopt(sys.argv[1:], "0osw:",
+         ["null", "old", "spaces", "width="])
    except GetoptError:
       usage(1)
 
    print0 = False
    old = False
+   spaces = ''
    width = None
 
    for option, value in options:
@@ -37,6 +45,8 @@ def get_args():
          print0 = True
       elif option in ("-o", "--old"):
          old = True
+      elif option in ("-s", "--spaces"):
+         spaces = ' '
       elif option in ("-w", "--width"):
          width = int(value)
       else:
@@ -50,9 +60,9 @@ def get_args():
       else:
          width = int(arguments[0])
 
-   return print0, old, width
+   return print0, old, spaces, width
 
-print0, old, width = get_args()
+print0, old, spaces, width = get_args()
 
 
 xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
@@ -62,6 +72,7 @@ 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
@@ -70,12 +81,16 @@ else:
 filename = global_db[key]
 global_db.close()
 
-if width is not None:
+
+if width:
    lines = []
    while filename:
-      lines.append(filename[:width])
+      lines.append("%s%s%s" % (spaces, filename[:width], spaces))
       filename = filename[width:]
    filename = "\n".join(lines)
+else:
+   filename = "%s%s%s" % (spaces, filename, spaces)
+
 
 sys.stdout.write(filename)