oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #145 from zeronet-conservancy/help_config_rework

Browse source 
show help if exception is thrown early in startup
This commit is contained in:
caryoscelus 2022-08-05 12:43:39 +00:00 committed by GitHub
commit 80c83fedaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.py
View file

@ -29,7 +29,8 @@ from Config import config
def load_config(): def load_config():
config.parse(silent=True) # Plugins need to access the configuration config.parse(silent=True) # Plugins need to access the configuration
if not config.arguments: # Config parse failed, show the help screen and exit if not config.arguments:
# Config parse failed completely, show the help screen and exit
config.parse() config.parse()
load_config() load_config()
@ -51,7 +52,16 @@ def init_dirs():
with open(users_json, "w") as f: with open(users_json, "w") as f:
f.write("{}") f.write("{}")
# TODO: GET RID OF TOP-LEVEL CODE!!!
try:
init_dirs() init_dirs()
except:
import traceback as tb
print(tb.format_exc())
# at least make sure to print help if we're otherwise so helpless
config.parser.print_help()
sys.exit(1)
if config.action == "main": if config.action == "main":
from util import helper from util import helper