From 84c798385f1495ae57f64d4d94f8db7c98578322 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 3 Apr 2021 23:40:20 +0200 Subject: [PATCH] save config for defined file (#64) * save config for defined file * don't call save_config with unset config_name --- server.py | 9 +++++---- web/app.py | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server.py b/server.py index 9ad97cb..ca7e94b 100755 --- a/server.py +++ b/server.py @@ -19,7 +19,7 @@ parser = argparse.ArgumentParser() def parse_args(): parser = argparse.ArgumentParser() - parser.add_argument("-f", "--config", help="config file, default file: config.json", type=argparse.FileType('r')) + parser.add_argument("-f", "--config", help="config file, default file: config.json", type=argparse.FileType('r'), default="config.json") parser.add_argument("-c", "--charge-control", help="enable charge control, default charge_config.json", const="charge_config.json", nargs='?', metavar='charge config file') parser.add_argument("-d", "--debug", help="enable debug", const=10, default=20, nargs='?', metavar='Debug level number') @@ -48,9 +48,10 @@ if __name__ == "__main__": my_logger(handler_level=args.debug) logger.info("server start") if args.config: - web.app.myp = MyPSACC.load_config(name=args.config.name) + config_name = args.config.name else: - web.app.myp = MyPSACC.load_config() + config_name = "config.json" + web.app.myp = MyPSACC.load_config(name=config_name) atexit.register(web.app.myp.save_config) if args.record: web.app.myp.set_record(True) @@ -82,7 +83,7 @@ if __name__ == "__main__": t2.setDaemon(True) t2.start() - save_config(web.app.myp) + save_config(web.app.myp, config_name) t1 = Thread(target=start_app, args=["My car info", args.base_path, logger.level < 20, args.listen, int(args.port)]) t1.setDaemon(True) t1.start() diff --git a/web/app.py b/web/app.py index 553fa8b..2a46939 100644 --- a/web/app.py +++ b/web/app.py @@ -49,6 +49,6 @@ myp:MyPSACC = None chc: ChargeControls = None -def save_config(my_peugeot: MyPSACC): - my_peugeot.save_config() - threading.Timer(30, save_config, args=[my_peugeot]).start() +def save_config(my_peugeot: MyPSACC, name): + my_peugeot.save_config(name) + threading.Timer(30, save_config, args=[my_peugeot, name]).start()