From cd1fbf332c9eea8a7b68f7bbbcce3346d179f2a1 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 21 Feb 2011 22:14:04 -0500 Subject: [PATCH] take dbfile as an argument, default to ~/.dwtt.db --- dwtt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dwtt b/dwtt index 377de42..74ba19f 100755 --- a/dwtt +++ b/dwtt @@ -5,21 +5,23 @@ import sys import getopt from Window import * +from DataStore import * PROGRAM_NAME = 'dwtt' def usage(): - print '''Usage: dwtt [options] [dbfile] + print '''Usage: %s [options] [dbfile] Options: --help Show this help -''' +''' % PROGRAM_NAME def main(argv): + dbfile = os.path.expanduser('~/.%s.db' % PROGRAM_NAME) try: opts, args = getopt.getopt(argv[1:], "", ["help"]) except getopt.GetoptError: usage() - sys.exit(1) + return 2 for opt, arg in opts: if opt == "--help": @@ -27,10 +29,17 @@ def main(argv): sys.exit() else: usage() - sys.exit(3) + return 2 - w = Window() + if len(args) == 1: + dbfile = args[0] + elif len(args) > 1: + usage() + return 2 + + ds = DataStore(dbfile) + w = Window(ds) w.main() if __name__ == "__main__": - main(sys.argv) + sys.exit(main(sys.argv))