From 9d8119b6ab60e4a3a8327df76c5874099131e86e Mon Sep 17 00:00:00 2001
From: awsr <43862868+awsr@users.noreply.github.com>
Date: Tue, 9 Dec 2025 19:23:16 -0800
Subject: [PATCH] Fix/update browser cache behavior

It was partially ignoring the setting and writing to cache anyway.
---
 javascript/gallery.js | 49 +++++++++++++++++++++++--------------------
 modules/shared.py     |  2 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/javascript/gallery.js b/javascript/gallery.js
index 751327554..fc36f5152 100644
--- a/javascript/gallery.js
+++ b/javascript/gallery.js
@@ -367,14 +367,14 @@ class GalleryFile extends HTMLElement {
     }
 
     this.hash = await getHash(`${this.folder}/${this.name}/${this.size}/${this.mtime}`); // eslint-disable-line no-use-before-define
-    const cache = (this.hash && opts.browser_cache) ? await idbGet(this.hash).catch(() => undefined) : undefined;
+    const cachedData = (this.hash && opts.browser_cache) ? await idbGet(this.hash).catch(() => undefined) : undefined;
     const img = document.createElement('img');
     img.className = 'gallery-file';
     img.loading = 'lazy';
     img.onload = async () => {
       img.title += `\nResolution: ${this.width} x ${this.height}`;
       this.title = img.title;
-      if (!cache && opts.browser_cache) {
+      if (!cachedData && opts.browser_cache) {
         if ((this.width === 0) || (this.height === 0)) { // fetch thumb failed so we use actual image
           this.width = img.naturalWidth;
           this.height = img.naturalHeight;
@@ -382,13 +382,13 @@ class GalleryFile extends HTMLElement {
       }
     };
     let ok = true;
-    if (cache && cache.img) {
-      img.src = cache.img;
-      this.exif = cache.exif;
-      this.width = cache.width;
-      this.height = cache.height;
-      this.size = cache.size;
-      this.mtime = new Date(cache.mtime);
+    if (cachedData?.img) {
+      img.src = cachedData.img;
+      this.exif = cachedData.exif;
+      this.width = cachedData.width;
+      this.height = cachedData.height;
+      this.size = cachedData.size;
+      this.mtime = new Date(cachedData.mtime);
     } else {
       try {
         const json = await delayFetchThumb(this.src, this.#signal);
@@ -401,20 +401,22 @@ class GalleryFile extends HTMLElement {
           this.height = json.height;
           this.size = json.size;
           this.mtime = new Date(json.mtime);
-          await idbAdd({
-            hash: this.hash,
-            folder: this.folder,
-            file: this.name,
-            size: this.size,
-            mtime: this.mtime,
-            width: this.width,
-            height: this.height,
-            src: this.src,
-            exif: this.exif,
-            img: img.src,
-            // exif: await getExif(img), // alternative client-side exif
-            // img: await createThumb(img), // alternative client-side thumb
-          });
+          if (opts.browser_cache) {
+            await idbAdd({
+              hash: this.hash,
+              folder: this.folder,
+              file: this.name,
+              size: this.size,
+              mtime: this.mtime,
+              width: this.width,
+              height: this.height,
+              src: this.src,
+              exif: this.exif,
+              img: img.src,
+              // exif: await getExif(img), // alternative client-side exif
+              // img: await createThumb(img), // alternative client-side thumb
+            });
+          }
         }
       } catch (err) { // thumb fetch failed so assign actual image
         img.src = `file=${this.src}`;
@@ -773,6 +775,7 @@ const maintenanceQueue = new SimpleFunctionQueue('Maintenance');
  * @param {AbortController} controller - AbortController that's handling this task
  */
 async function thumbCacheCleanup(folder, imgCount, controller) {
+  if (!opts.browser_cache) return;
   try {
     if (typeof folder !== 'string' || typeof imgCount !== 'number') {
       throw new Error('Function called with invalid arguments');
diff --git a/modules/shared.py b/modules/shared.py
index 7ec809d78..36ed578f7 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -502,7 +502,7 @@ options_templates.update(options_section(('saving-images', "Image Options"), {
     "font_color": OptionInfo("#FFFFFF", "Font color", gr.ColorPicker, {}),
 
     "image_sep_browser": OptionInfo("<h2>Image Gallery</h2>", "", gr.HTML),
-    "browser_cache": OptionInfo(True, "Use image gallery cache"),
+    "browser_cache": OptionInfo(True, "Use image gallery cache [STRONGLY recommended]"),
     "browser_folders": OptionInfo("", "Additional image browser folders"),
     "browser_fixed_width": OptionInfo(False, "Use fixed width thumbnails"),
     "viewer_show_metadata": OptionInfo(True, "Show metadata in full screen image browser"),