From b18c2aea050aa8c6f800ddf33960a6b5c94ba5c1 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 17:31:20 +0530
Subject: [PATCH] Don't cache css and js files, it's really annoying after
 merging every PR to have to update the version number in index.html.
 Disabling this until we figure out a better way

---
 ui/index.html | 30 +++++++++++++++---------------
 ui/server.py  | 12 ++++++++++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 08ad2101..d889502d 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -5,12 +5,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" type="image/png" href="/media/images/favicon-16x16.png" sizes="16x16">
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
-    <link rel="stylesheet" href="/media/css/fonts.css?v=1">
-    <link rel="stylesheet" href="/media/css/themes.css?v=6">
-    <link rel="stylesheet" href="/media/css/main.css?v=27">
-    <link rel="stylesheet" href="/media/css/auto-save.css?v=6">
-    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
-    <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
+    <link rel="stylesheet" href="/media/css/fonts.css">
+    <link rel="stylesheet" href="/media/css/themes.css">
+    <link rel="stylesheet" href="/media/css/main.css">
+    <link rel="stylesheet" href="/media/css/auto-save.css">
+    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css">
+    <link rel="stylesheet" href="/media/css/fontawesome-all.min.css">
     <link rel="stylesheet" href="/media/css/drawingboard.min.css">
     <script src="/media/js/jquery-3.6.1.min.js"></script>
     <script src="/media/js/drawingboard.min.js"></script>
@@ -328,15 +328,15 @@
 </div>
 </body>
 
-<script src="media/js/utils.js?v=7"></script>
-<script src="media/js/parameters.js?v=11"></script>
-<script src="media/js/plugins.js?v=1"></script>
-<script src="media/js/inpainting-editor.js?v=1"></script>
-<script src="media/js/image-modifiers.js?v=7"></script>
-<script src="media/js/auto-save.js?v=9"></script>
-<script src="media/js/main.js?v=28"></script>
-<script src="media/js/themes.js?v=5"></script>
-<script src="media/js/dnd.js?v=11"></script>
+<script src="media/js/utils.js"></script>
+<script src="media/js/parameters.js"></script>
+<script src="media/js/plugins.js"></script>
+<script src="media/js/inpainting-editor.js"></script>
+<script src="media/js/image-modifiers.js"></script>
+<script src="media/js/auto-save.js"></script>
+<script src="media/js/main.js"></script>
+<script src="media/js/themes.js"></script>
+<script src="media/js/dnd.js"></script>
 <script>
 async function init() {
     await initSettings()
diff --git a/ui/server.py b/ui/server.py
index 07464242..ab910bfa 100644
--- a/ui/server.py
+++ b/ui/server.py
@@ -61,10 +61,18 @@ ACCESS_LOG_SUPPRESS_PATH_PREFIXES = ['/ping', '/image', '/modifier-thumbnails']
 
 NOCACHE_HEADERS={"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
 
-app.mount('/media', StaticFiles(directory=os.path.join(SD_UI_DIR, 'media')), name="media")
+class NoCacheStaticFiles(StaticFiles):
+    def is_not_modified(self, response_headers, request_headers) -> bool:
+        if 'content-type' in response_headers and ('javascript' in response_headers['content-type'] or 'css' in response_headers['content-type']):
+            response_headers.update(NOCACHE_HEADERS)
+            return False
+
+        return super().is_not_modified(response_headers, request_headers)
+
+app.mount('/media', NoCacheStaticFiles(directory=os.path.join(SD_UI_DIR, 'media')), name="media")
 
 for plugins_dir, dir_prefix in UI_PLUGINS_SOURCES:
-    app.mount(f'/plugins/{dir_prefix}', StaticFiles(directory=plugins_dir), name=f"plugins-{dir_prefix}")
+    app.mount(f'/plugins/{dir_prefix}', NoCacheStaticFiles(directory=plugins_dir), name=f"plugins-{dir_prefix}")
 
 def getConfig(default_val=APP_CONFIG_DEFAULTS):
     try: