Merge pull request #4616 from awsr/gallery-fix

Gallery fix

javascript/gallery.js

@@ -456,11 +456,9 @@ class GalleryFile extends HTMLElement {
           this.size = json.size;
           this.mtime = new Date(json.mtime);
           if (opts.browser_cache) {
-            // Store file's actual parent directory (not browsed folder) for consistent cleanup
-            const fileDir = this.src.replace(/\/+/g, '/').replace(/\/[^/]+$/, '');
             await idbAdd({
               hash: this.hash,
-              folder: fileDir,
+              folder: this.folder,
               file: this.name,
               size: this.size,
               mtime: this.mtime,

javascript/indexdb.js

@@ -185,10 +185,7 @@ async function idbFolderCleanup(keepSet, folder, signal) {
     throw new Error('IndexedDB cleaning function must be told the current active folder');
   }
 
-  // Use range query to match folder and all its subdirectories
-  const folderNormalized = folder.replace(/\/+/g, '/').replace(/\/$/, '');
-  const range = IDBKeyRange.bound(folderNormalized, `${folderNormalized}\uffff`, false, true);
-  let removals = new Set(await idbGetAllKeys('folder', range));
+  let removals = new Set(await idbGetAllKeys('folder', folder));
   removals = removals.difference(keepSet); // Don't need to keep full set in memory
   const totalRemovals = removals.size;
   if (signal.aborted) {