diff --git a/larigira/event_manage.py b/larigira/event_manage.py index 7bbf09a..ee1a41e 100644 --- a/larigira/event_manage.py +++ b/larigira/event_manage.py @@ -8,19 +8,19 @@ from .config import get_conf def main_list(args): - m = EventModel(args.file) + m = EventModel(args.file, args.additional_dir) for alarm, action in m.get_all_alarms_expanded(): json.dump(dict(alarm=alarm, action=action), sys.stdout, indent=4) sys.stdout.write('\n') def main_getaction(args): - m = EventModel(args.file) - json.dump(m.get_action_by_id(int(args.actionid)), sys.stdout, indent=4) + m = EventModel(args.file, args.additional_dir) + json.dump(m.get_action_by_id(args.actionid), sys.stdout, indent=4) def main_add(args): - m = EventModel(args.file) + m = EventModel(args.file, args.additional_dir) m.add_event( dict(kind="frequency", interval=args.interval, start=1), [dict(kind="mpd", howmany=1)], @@ -29,11 +29,14 @@ def main_add(args): def main(): conf = get_conf() - p = argparse.ArgumentParser() + p = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter) p.set_defaults(func=None) p.add_argument( "-f", "--file", help="Filepath for DB", required=False, default=conf["DB_URI"] ) + p.add_argument( + "-d", "--additional-dir", help="Filepath for extra DBs", required=False, default=conf["DB_ADDITIONAL_DIR"] + ) sub = p.add_subparsers() sub_list = sub.add_parser("list") sub_list.set_defaults(func=main_list)