andis/doc.2020.app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

static file path

Browse Source
This commit is contained in:
Andreas Stephanides
2021-11-28 21:30:55 +00:00
parent 993d8ec69b
commit 713488c453
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flaskpages/__init__.py
View File

@@ -10,7 +10,8 @@ def create_app(test_config=None):
app.config.from_mapping( app.config.from_mapping(
# a default secret that should be overridden by instance config # a default secret that should be overridden by instance config
SECRET_KEY="dev", SECRET_KEY="dev",
URL_PREFIX = "/" URL_PREFIX = "/",
) )
if not test_config: if not test_config:

32
flaskpages/pages.py
View File

@@ -1,5 +1,5 @@
from flask import Flask, Blueprint,render_template, send_from_directory,jsonify, url_for from flask import Flask, Blueprint,render_template, send_from_directory,jsonify, url_for, abort
from flatpages_index import FlatPagesIndex from flatpages_index import FlatPagesIndex
import flatpages_index import flatpages_index
import os import os
@@ -21,6 +21,7 @@ def create_bp(app):
def thumb(size=64,name=''): def thumb(size=64,name=''):
pass pass
@page_blueprint.route('/<path:name>/') @page_blueprint.route('/<path:name>/')
@page_blueprint.route('/') @page_blueprint.route('/')
def page(name='index'): def page(name='index'):
@@ -32,11 +33,18 @@ def create_bp(app):
page.links.endpoint='pages.page' page.links.endpoint='pages.page'
return render_template(page["template"], post=page, return render_template(page["template"], post=page,
pth=page["dirpath"]) pth=page["dirpath"])
app.logger.debug(f"delivering static file: {name}")
if os.path.exists(os.path.join(app.config['FLATPAGES_ROOT'],name)): # search different loctions for static file
return send_from_directory(app.config['FLATPAGES_ROOT'],name) paths = [ app.config['FLATPAGES_ROOT'],
else: os.path.abspath(app.config['STATIC_ROOT'])
return send_from_directory('static',name) ]
for p in paths:
if os.path.exists(os.path.join(p,name)):
return send_from_directory(p,name)
app.logger.debug(f"Static file {name} not found in : {paths}")
return abort(404)
@page_blueprint.route('/<path:name>.json',strict_slashes=False) @page_blueprint.route('/<path:name>.json',strict_slashes=False)
@@ -48,10 +56,16 @@ def create_bp(app):
# page.links.file_url=lambda n: url_for('intern.post', name=n) # page.links.file_url=lambda n: url_for('intern.post', name=n)
return jsonify(page=dict(page)) return jsonify(page=dict(page))
if os.path.exists(u'{}/{}'.format(app.config['FLATPAGES_ROOT'],path)): # search different loctions for static file
return send_from_directory(app.config['FLATPAGES_ROOT'],path) paths = [ app.config['FLATPAGES_ROOT'],
else: os.path.abspath(app.config['STATIC_ROOT'])
return send_from_directory('static',path) ]
for p in paths:
if os.path.exists(os.path.join(p,name)):
return send_from_directory(p,name)
app.logger.debug(f"Static file {name} not found in : {paths}")
return abort(404)
return page_blueprint return page_blueprint