From 8cbc7a8e563b578d660db3ed4a2258affe2cfb0d Mon Sep 17 00:00:00 2001 From: Krateng Date: Mon, 24 Jun 2019 15:43:04 +0200 Subject: [PATCH] Added simpler redirect directly from page script --- server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 8495559..d5a06ff 100755 --- a/server.py +++ b/server.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # server stuff -from bottle import Bottle, route, get, post, error, run, template, static_file, request, response, FormsDict, redirect, template +from bottle import Bottle, route, get, post, error, run, template, static_file, request, response, FormsDict, redirect, template, HTTPResponse import waitress # monkey patching import monkey @@ -140,7 +140,11 @@ def static_html(name): if os.path.exists("website/" + name + ".py"): #txt_keys = SourceFileLoader(name,"website/" + name + ".py").load_module().replacedict(keys,DATABASE_PORT) try: - txt_keys,resources = SourceFileLoader(name,"website/" + name + ".py").load_module().instructions(keys) + content = SourceFileLoader(name,"website/" + name + ".py").load_module().instructions(keys) + if isinstance(content,str): redirect(content) + txt_keys, resources = content + except HTTPResponse as e: + raise except Exception as e: log("Error in website generation: " + str(sys.exc_info()),module="error") raise