mirror of https://github.com/krateng/maloja.git
Compare commits
No commits in common. "97fc38f9193ba7d0d47616aae7fc71f5d58f013a" and "1eaba888c741c7af1d5a5e772e70cb2277be3d1a" have entirely different histories.
97fc38f919
...
1eaba888c7
|
@ -47,12 +47,9 @@ def init_apis(server):
|
|||
server.get(altpath_empty_cl)(alias_api)
|
||||
server.post(altpath_empty_cl)(alias_api)
|
||||
|
||||
def invalid_api(pth=''):
|
||||
def invalid_api(pth):
|
||||
response.status = 404
|
||||
return {"error":"Invalid API"}
|
||||
|
||||
server.get("/apis/<pth:path>")(invalid_api)
|
||||
server.post("/apis/<pth:path>")(invalid_api)
|
||||
|
||||
server.get("/apis")(invalid_api)
|
||||
server.post("/apis")(invalid_api)
|
||||
|
|
|
@ -10,7 +10,6 @@ import time
|
|||
# server stuff
|
||||
from bottle import Bottle, static_file, request, response, FormsDict, redirect, BaseRequest, abort
|
||||
import waitress
|
||||
from jinja2.exceptions import TemplateNotFound
|
||||
|
||||
# doreah toolkit
|
||||
from doreah.logging import log
|
||||
|
@ -213,11 +212,10 @@ def jinja_page(name):
|
|||
"_urikeys":keys, #temporary!
|
||||
}
|
||||
loc_context["filterkeys"], loc_context["limitkeys"], loc_context["delimitkeys"], loc_context["amountkeys"], loc_context["specialkeys"] = uri_to_internal(keys)
|
||||
|
||||
template = jinja_environment.get_template(name + '.jinja')
|
||||
try:
|
||||
template = jinja_environment.get_template(name + '.jinja')
|
||||
res = template.render(**loc_context)
|
||||
except TemplateNotFound:
|
||||
abort(404,f"Not found: '{name}'")
|
||||
except (ValueError, IndexError):
|
||||
abort(404,"This Artist or Track does not exist")
|
||||
|
||||
|
|
Loading…
Reference in New Issue