True static items will be in const (due to anti-cache workaround)

2019-02-12 17:35:58 +01:00 · 2019-02-12 17:35:58 +01:00 · 15cab52d54
commit 15cab52d54
parent 409ed7b5a2
25 changed files with 8 additions and 8 deletions
--- a/main.py
+++ b/main.py
@ -17,12 +17,12 @@ if glob.config["disable-static-cache"]:
 		return dict(url_for=dated_url_for)
 	def dated_url_for(endpoint, **values):
-		if endpoint == 'static':
+		if endpoint == "static":
-			filename = values.get('filename', None)
+			filename = values.get("filename", None)
-			if filename:
+			if filename and not filename.startswith("const/"):
 				file_path = os.path.join(glob.app.root_path,
 										endpoint, filename)
-				values['q'] = int(os.stat(file_path).st_mtime)
+				values["q"] = int(os.stat(file_path).st_mtime)
 		return url_for(endpoint, **values)
 if __name__ == "__main__":
--- a/static/const/css/bootstrap-grid.css
+++ b/static/const/css/bootstrap-grid.css
--- a/static/const/css/bootstrap-grid.css.map
+++ b/static/const/css/bootstrap-grid.css.map
--- a/static/const/css/bootstrap-grid.min.css
+++ b/static/const/css/bootstrap-grid.min.css
--- a/static/const/css/bootstrap-grid.min.css.map
+++ b/static/const/css/bootstrap-grid.min.css.map
--- a/static/const/css/bootstrap-reboot.css
+++ b/static/const/css/bootstrap-reboot.css
--- a/static/const/css/bootstrap-reboot.css.map
+++ b/static/const/css/bootstrap-reboot.css.map
--- a/static/const/css/bootstrap-reboot.min.css
+++ b/static/const/css/bootstrap-reboot.min.css
--- a/static/const/css/bootstrap-reboot.min.css.map
+++ b/static/const/css/bootstrap-reboot.min.css.map
--- a/static/const/css/bootstrap.css
+++ b/static/const/css/bootstrap.css
--- a/static/const/css/bootstrap.css.map
+++ b/static/const/css/bootstrap.css.map
--- a/static/const/css/bootstrap.min.css
+++ b/static/const/css/bootstrap.min.css
--- a/static/const/css/bootstrap.min.css.map
+++ b/static/const/css/bootstrap.min.css.map
--- a/static/const/js/bootstrap.bundle.js
+++ b/static/const/js/bootstrap.bundle.js
--- a/static/const/js/bootstrap.bundle.js.map
+++ b/static/const/js/bootstrap.bundle.js.map
--- a/static/const/js/bootstrap.bundle.min.js
+++ b/static/const/js/bootstrap.bundle.min.js
--- a/static/const/js/bootstrap.bundle.min.js.map
+++ b/static/const/js/bootstrap.bundle.min.js.map
--- a/static/const/js/bootstrap.js
+++ b/static/const/js/bootstrap.js
--- a/static/const/js/bootstrap.js.map
+++ b/static/const/js/bootstrap.js.map
--- a/static/const/js/bootstrap.min.js
+++ b/static/const/js/bootstrap.min.js
--- a/static/const/js/bootstrap.min.js.map
+++ b/static/const/js/bootstrap.min.js.map
--- a/static/const/js/jquery-3.3.1.slim.min.js
+++ b/static/const/js/jquery-3.3.1.slim.min.js
--- a/static/const/js/jquery-3.3.1.slim.min.map
+++ b/static/const/js/jquery-3.3.1.slim.min.map
--- a/static/const/js/popper.min.js
+++ b/static/const/js/popper.min.js
--- a/templates/layout/bootstrap.html
+++ b/templates/layout/bootstrap.html
@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
+	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='const/css/bootstrap.min.css') }}">
 {% if title %}
 	<title>Husstanden - {{ title }}</title>
@ -13,8 +13,8 @@
 </head>
 <body>
 {% block content %}{% endblock %}
-	<script src="{{ url_for('static', filename='js/jquery-3.3.1.slim.min.js') }}"></script>
+	<script src="{{ url_for('static', filename='const/js/jquery-3.3.1.slim.min.js') }}"></script>
-	<script src="{{ url_for('static', filename='js/popper.min.js') }}"></script>
+	<script src="{{ url_for('static', filename='const/js/popper.min.js') }}"></script>
-	<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+	<script src="{{ url_for('static', filename='const/js/bootstrap.min.js') }}"></script>
 </body>
 </html>