sheppy/flask-json-dream-website
1
0
Fork 0
mirror of https://github.com/FAUSheppy/flask-json-dream-website synced 2025-12-06 08:11:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add common name option

Browse Source
This commit is contained in:
Yannik Schmidt
2021-05-14 00:04:04 +02:00
parent 9a78b1e40d
commit 0a3cf11244
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server.py
View File

@@ -205,6 +205,7 @@ def content():
# check for extra config # # check for extra config #
extraConfigDir = app.config[identifier + CONFIG_POSTFIX] extraConfigDir = app.config[identifier + CONFIG_POSTFIX]
commonName = app.config.get(identifier + CONFIG_POSTFIX + "cn")
extraConfig = None extraConfig = None
markupText = None markupText = None
if extraConfigDir: if extraConfigDir:
@@ -212,14 +213,15 @@ def content():
if os.path.isdir(fullpath): if os.path.isdir(fullpath):
extraConfig = readJsonDir(fullpath) extraConfig = readJsonDir(fullpath)
markupText = flask.Markup(flask.render_template(app.config[identifier], markupText = flask.Markup(flask.render_template(app.config[identifier],
extraConfig=extraConfig)) extraConfig=extraConfig, commonName=commonName))
else: else:
with open(fullpath) as f: with open(fullpath) as f:
markupText = markdown2.markdown(f.read()) markupText = markdown2.markdown(f.read())
container = True container = True
return flask.render_template("default_content.html", container=container, return flask.render_template("default_content.html", container=container,
conf=app.config, markupText=markupText) conf=app.config, markupText=markupText,
commonName=commonName)
else: else:
return (EMPTY_STRING, HTTP_NOT_FOUND) return (EMPTY_STRING, HTTP_NOT_FOUND)
@@ -418,6 +420,8 @@ def init():
app.config[configKey] = subpages[identifier]["config-dir"] app.config[configKey] = subpages[identifier]["config-dir"]
else: else:
app.config[configKey] = subpages[identifier]["markdown"] app.config[configKey] = subpages[identifier]["markdown"]
if "cn" in subpages[identifier]:
app.config[configKey + "cn"] = subpages[identifier]["cn"]
else: else:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier] app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]
app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None