From e8f6862fd26c45551959835378a08295e0538667 Mon Sep 17 00:00:00 2001
From: Arksine <9563098+Arksine@users.noreply.github.com>
Date: Sat, 17 Apr 2021 07:05:31 -0400
Subject: [PATCH] app:  cache modified time in static file handler

Force an update to cached file hashes should the modified time change.  Re-enable the "should_return_304" check so clients can re-implement caching.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/app.py | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/moonraker/app.py b/moonraker/app.py
index 8d81759..45ff2e2 100644
--- a/moonraker/app.py
+++ b/moonraker/app.py
@@ -8,6 +8,7 @@ import os
 import mimetypes
 import logging
 import json
+import datetime
 import tornado
 import tornado.iostream
 import tornado.httputil
@@ -479,9 +480,32 @@ class FileRequestHandler(AuthorizedFileHandler):
         else:
             assert self.request.method == "HEAD"
 
-    def should_return_304(self):
-        # Disable file caching
-        return False
+    @classmethod
+    def _get_cached_version(cls, abs_path: str):
+        with cls._lock:
+            hashes = cls._static_hashes
+            try:
+                mtime = datetime.datetime.fromtimestamp(
+                    os.path.getmtime(abs_path), tz=datetime.timezone.utc)
+            except Exception:
+                logging.exception(
+                    f"Unable to get modified time for file: {abs_path}")
+                hashes.pop(abs_path, None)
+                return None
+            if abs_path not in hashes or mtime != hashes[abs_path]['modified']:
+                try:
+                    hashes[abs_path] = {
+                        'modified': mtime,
+                        'hash': cls.get_content_version(abs_path)
+                    }
+                except Exception:
+                    logging.exception(f"Could not open static file {abs_path}")
+                    hashes.pop(abs_path, None)
+                    return None
+            hsh = hashes.get(abs_path, {}).get('hash')
+            if hsh:
+                return hsh
+        return None
 
 @tornado.web.stream_request_body
 class FileUploadHandler(AuthorizedRequestHandler):