joachim
/
openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix config command

This commit is contained in:
Jakob Ketterl 2021-04-26 19:34:50 +02:00
parent 05985ff46a
commit 4691987cc4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
owrx/__main__.py
View File

@ -44,17 +44,21 @@ def main():
configparser = moduleparser.add_parser("config", help="Configuration actions") configparser = moduleparser.add_parser("config", help="Configuration actions")
configcommandparser = configparser.add_subparsers(title="Commands", dest="command") configcommandparser = configparser.add_subparsers(title="Commands", dest="command")
migrateparser = configcommandparser.add_parser("migrate", help="Migrage configuration files") migrateparser = configcommandparser.add_parser("migrate", help="Migrate configuration files")
migrateparser.set_defaults(cls=MigrateCommand) migrateparser.set_defaults(cls=MigrateCommand)
args = parser.parse_args() args = parser.parse_args()
if args.version: if args.version:
print("OpenWebRX version {version}".format(version=openwebrx_version)) print("OpenWebRX version {version}".format(version=openwebrx_version))
elif args.module in ["admin", "config"]: elif args.module == "admin":
# override loglevel for admin commands, they shouldn't be that verbose # override loglevel for admin commands, they shouldn't be that verbose
logging.basicConfig(level=logging.INFO, force=True) logging.basicConfig(level=logging.INFO, force=True)
run_admin_action(adminparser, args) run_admin_action(adminparser, args)
elif args.module == "config":
# override loglevel for config commands, they shouldn't be that verbose
logging.basicConfig(level=logging.INFO, force=True)
run_admin_action(configparser, args)
else: else:
start_receiver() start_receiver()

3
owrx/admin/__init__.py
View File

@ -39,11 +39,12 @@ def add_admin_parser(moduleparser):
) )
moduleparser.add_argument("--silent", action="store_true", help="Ignore errors (useful for automation)") moduleparser.add_argument("--silent", action="store_true", help="Ignore errors (useful for automation)")
def run_admin_action(parser, args): def run_admin_action(parser, args):
if hasattr(args, "cls"): if hasattr(args, "cls"):
command = args.cls() command = args.cls()
else: else:
if not args.silent: if not hasattr(args, "silent") or not args.silent:
parser.print_help() parser.print_help()
sys.exit(1) sys.exit(1)
sys.exit(0) sys.exit(0)