From e419658ab913dcc21e93573fd8a277c1f0618eab Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Tue, 28 Jul 2015 16:48:53 +0300 Subject: [PATCH] Print older files using an index --- print-filename.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/print-filename.py b/print-filename.py index 1a448d3..518ab21 100755 --- a/print-filename.py +++ b/print-filename.py @@ -20,7 +20,7 @@ if not xsetbg_db: def usage(code=0): - sys.stderr.write("Usage: %s [-o|--old]\n" % sys.argv[0]) + sys.stderr.write("Usage: %s [index]\n" % sys.argv[0]) sys.exit(code) @@ -28,12 +28,12 @@ def get_args(): from getopt import getopt, GetoptError try: - options, arguments = getopt(sys.argv[1:], "he:o", - ["help", "output-encoding=", "old"]) + options, arguments = getopt(sys.argv[1:], "he:", + ["help", "output-encoding="]) except GetoptError: usage(1) - old = False + index = 0 output_encoding = None for option, value in options: @@ -41,26 +41,24 @@ def get_args(): usage() elif option in ("-e", "--output-encoding"): output_encoding = value - elif option in ("-o", "--old"): - old = True else: usage(2) if arguments: - usage(3) + if len(arguments) == 1: + try: + index = int(arguments[0]) + except ValueError: + usage(3) + else: + usage(4) if output_encoding is None: from m_lib.defenc import default_encoding output_encoding = default_encoding - return old, output_encoding - -old, output_encoding = get_args() + return index, output_encoding - -if old: - index = 1 -else: - index = 0 +index, output_encoding = get_args() filename = xsetbg_db.select('last_shown IS NOT NULL', orderBy='-last_shown')[index].full_name -- 2.39.2