rc/friwall
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate error handling

Browse source 
Do or do not; there is no try. With some exceptions.
This commit is contained in:
Timotej Lazar 2023-07-12 14:18:31 +02:00
parent 8c824fe9e6
commit a5df435931
5 changed files with 106 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

56
web/config.py
View file

@ -11,43 +11,29 @@ blueprint = flask.Blueprint('config', __name__, url_prefix='/config')
@blueprint.route('/', methods=('GET', 'POST'))
@flask_login.login_required
def index():
try:
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
with db.locked():
settings = db.read('settings')
if flask.request.method == 'POST':
form = flask.request.form
for name, value in form.items():
if name in settings:
settings[name] = value
db.write('settings', settings)
system.run(system.save_config)
return flask.redirect(flask.url_for('config.index'))
return flask.render_template('config/index.html', settings=settings)
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')
with db.locked():
settings = db.read('settings')
if flask.request.method == 'POST':
form = flask.request.form
for name, value in form.items():
if name in settings:
settings[name] = value
db.write('settings', settings)
system.run(system.save_config)
return flask.redirect(flask.url_for('config.index'))
return flask.render_template('config/index.html', settings=settings)
@blueprint.route('/edit/<name>', methods=('GET', 'POST'))
@flask_login.login_required
def edit(name):
try:
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
if flask.request.method == 'POST':
form = flask.request.form
db.save(name, json.loads(form.get('text').replace('\r\n', '\n')))
system.run(system.save_config)
content = json.dumps(db.load(name), indent=2)
return flask.render_template('config/edit.html', **locals())
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
if flask.request.method == 'POST':
form = flask.request.form
db.save(name, json.loads(form.get('text').replace('\r\n', '\n')))
system.run(system.save_config)
content = json.dumps(db.load(name), indent=2)
return flask.render_template('config/edit.html', **locals())