From 661f084ccb18819bc9bf0060226f4009a83797cf Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Tue, 14 Feb 2006 11:54:06 +0000 Subject: [PATCH] Added spaces. git-svn-id: file:///home/phd/archive/SVN/xsetbg/trunk@6 143022c7-580b-0410-bae3-87f2bf5d3141 --- print-filename.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/print-filename.py b/print-filename.py index f309386..72769b1 100755 --- a/print-filename.py +++ b/print-filename.py @@ -15,7 +15,7 @@ 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) @@ -23,13 +23,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: @@ -39,6 +40,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: @@ -52,9 +55,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") @@ -64,6 +67,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 @@ -72,12 +76,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) -- 2.39.2