static_cachebuster: build the url with url_for

nyaa/routes.py

@@ -52,7 +52,7 @@ def redirect_url():
 
 
 @app.template_global()
-def static_cachebuster(static_filename):
+def static_cachebuster(filename):
     ''' Adds a ?t=<mtime> cachebuster to the given path, if the file exists.
         Results are cached in memory and persist until app restart! '''
     # Instead of timestamps, we could use commit hashes (we already load it in __init__)
@@ -61,19 +61,18 @@ def static_cachebuster(static_filename):
 
     if app.debug:
         # Do not bust cache on debug (helps debugging)
-        return static_filename
+        return flask.url_for('static', filename=filename)
 
     # Get file mtime if not already cached.
-    if static_filename not in _static_cache:
+    if filename not in _static_cache:
-        file_path = os.path.join(app.config['BASE_DIR'], 'nyaa', static_filename[1:])
+        file_path = os.path.join(app.static_folder, filename)
+        file_mtime = None
         if os.path.exists(file_path):
             file_mtime = int(os.path.getmtime(file_path))
-            _static_cache[static_filename] = static_filename + '?t=' + str(file_mtime)
-        else:
-            # Throw a warning?
-            _static_cache[static_filename] = static_filename
 
-    return _static_cache[static_filename]
+        _static_cache[filename] = file_mtime
+
+    return flask.url_for('static', filename=filename, t=_static_cache[filename])
 
 
 @app.template_global()

nyaa/templates/layout.html

@@ -25,10 +25,10 @@
 			make the navbar not look awful on tablets.
 		-->
 		{# These are extracted here for the dark mode toggle #}
-		{% set bootstrap_light = static_cachebuster('/static/css/bootstrap.min.css') %}
+		{% set bootstrap_light = static_cachebuster('css/bootstrap.min.css') %}
-		{% set bootstrap_dark = static_cachebuster('/static/css/bootstrap-dark.min.css') %}
+		{% set bootstrap_dark = static_cachebuster('css/bootstrap-dark.min.css') %}
 		<link href="{{ bootstrap_light }}" rel="stylesheet" id="bsThemeLink">
-		<link href="{{ static_cachebuster('/static/css/bootstrap-xl-mod.css') }}" rel="stylesheet">
+		<link href="{{ static_cachebuster('css/bootstrap-xl-mod.css') }}" rel="stylesheet">
 		<!--
 			This theme changer script needs to be inline and right under the above stylesheet link to prevent FOUC (Flash Of Unstyled Content)
 			Development version is commented out in static/js/main.js at the bottom of the file
@@ -38,15 +38,15 @@
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 
 		<!-- Custom styles for this template -->
-		<link href="{{ static_cachebuster('/static/css/main.css') }}" rel="stylesheet">
+		<link href="{{ static_cachebuster('css/main.css') }}" rel="stylesheet">
 
 		<!-- Core JavaScript -->
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/commonmark/0.27.0/commonmark.min.js" integrity="sha256-10JreQhQG80GtKuzsioj0K46DlaB/CK/EG+NuG0q97E=" crossorigin="anonymous"></script>
 		<!-- Modified to not apply border-radius to selectpickers and stuff so our navbar looks cool -->
-		<script src="{{ static_cachebuster('/static/js/bootstrap-select.js') }}"></script>
+		<script src="{{ static_cachebuster('js/bootstrap-select.js') }}"></script>
-		<script src="{{ static_cachebuster('/static/js/main.js') }}"></script>
+		<script src="{{ static_cachebuster('js/main.js') }}"></script>
 
 		<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 		<!--[if lt IE 9]>