From: Oleg Broytman Date: Wed, 8 Oct 2008 15:54:58 +0000 (+0000) Subject: Moved all text wrapping to a separate program text-wrap.py. X-Git-Tag: v4.0.0~45 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6087a8defffe9958302daac8958cd9dcfd358fc3;p=xsetbg.git Moved all text wrapping to a separate program text-wrap.py. git-svn-id: file:///home/phd/archive/SVN/xsetbg/trunk@23 143022c7-580b-0410-bae3-87f2bf5d3141 --- diff --git a/print-filename.py b/print-filename.py index d664d79..59eb876 100755 --- a/print-filename.py +++ b/print-filename.py @@ -20,7 +20,7 @@ import sys, os, shelve def usage(code=0): - sys.stderr.write("Usage: %s [-0|--null] [-n|--no-newline] [-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,44 +28,26 @@ def get_args(): from getopt import getopt, GetoptError try: - options, arguments = getopt(sys.argv[1:], "0nosw:", - ["null", "no-newline", "old", "spaces", "width="]) + options, arguments = getopt(sys.argv[1:], "ho", ["help", "old"]) except GetoptError: usage(1) - print0 = False - newline = True old = False - spaces = '' - width = None for option, value in options: if option in ("-h", "--help"): 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"): - 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, newline, old, spaces, width + return old -print0, newline, old, spaces, width = get_args() +old = get_args() xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg") @@ -87,18 +69,4 @@ 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 = u'\n'.join(lines) -else: - filename = u"%s%s%s" % (spaces, filename, spaces) - -sys.stdout.write(filename.encode(default_encoding)) - -if print0: - sys.stdout.write('\0') -elif newline: - print +print filename.encode(default_encoding)