From 84680e8e6e6bf6aefc44104f1de2b34a048c41ef Mon Sep 17 00:00:00 2001
From: Hans Dijkema <hans@dijkewijk.nl>
Date: Wed, 1 Jul 2026 13:36:11 +0200
Subject: [PATCH] Handle renames

---
 private/file-walker.rkt | 118 +++++++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 50 deletions(-)

diff --git a/private/file-walker.rkt b/private/file-walker.rkt
index 2210883..c23bfd1 100644
--- a/private/file-walker.rkt
+++ b/private/file-walker.rkt
@@ -19,14 +19,19 @@
   (let ((delim (if (eq? (system-path-convention-type) 'windows) "\\" "/")))
     (string-replace str "/" delim)))
 
+(define (make-next-gen base-path glob-pattern)
+  (sequence->generator
+   (sequence-filter
+    (λ (p)
+      (let ((basename (file-name-from-path p)))
+        (glob-match? glob-pattern basename)))
+    (in-directory base-path))))
+        
+
 (define (make-file-walker base-path glob-pattern filter-func
                           #:filename-cleaner [filename-cleaner-func (λ (f) f)])
-  (let* ((gen (sequence->generator
-               (sequence-filter
-                (λ (p)
-                  (let ((basename (file-name-from-path p)))
-                    (glob-match? glob-pattern basename)))
-                (in-directory base-path))))
+  (let* ((gen (make-next-gen base-path glob-pattern))
+         (next-gens '())
          (str-base-path* (format "~a" (normalize-path base-path)))
          (delim (if (eq? (system-path-convention-type) 'windows) "\\" "/"))
          (str-base-path (if (string-suffix? str-base-path* delim)
@@ -35,52 +40,65 @@
          (base-path-len (string-length str-base-path))
          (result #f)
          )
-    (λ ()
-      (let ((path (gen)))
-        (if (void? path)
-            (values #f #f #f)
-            (let* ((bd (basedir path))
-                   (bn (format "~a" (basename path)))
-                   (nbn (filename-cleaner-func (clean-os-basename bn)))
-                   )
-
-              (unless (string=? bn nbn)
-                (with-handlers ([exn? (λ (e)
-                                         (warn-am "Cannot rename dirty filename: ~a, ~a" nbn e))])
-                  (info-am "Renaming ~a to ~a (basedir: ~a)" bn nbn bd)
-                  (rename-file-or-directory (build-path bd bn)
-                                            (build-path bd nbn) #f)
-                  (set! path (build-path bd nbn))
-                  ))
-              
-              (let* ((str-path (path->string path))
-                     (ext* (path-get-extension path))
-                     (ext (string->symbol
-                           (substring
-                            (if (eq? ext* #f)
-                                "."
-                                (let ((e (string-downcase (bytes->string/utf-8 ext*))))
-                                  (if (string-contains? e " ")
-                                      "."
-                                      e))) 1)))
-                     (path-part (substring str-path base-path-len))
-                     (str-n-path (string-replace path-part "\\" "/"))
-                     (info (let ((h (make-hash (list
-                                                (cons 'type 'dir)
-                                                (cons 'path str-n-path)
-                                                (cons 'ext ext)))))
-                             (when (file-exists? path)
-                               (hash-set! h 'type 'file)
-                               (hash-set! h 'size (file-size path))
-                               (hash-set! h 'mtime (file-or-directory-modify-seconds path))
-                               )
-                             h))
+    (letrec ((walker-func
+      (λ ()
+        (let ((path (gen)))
+          (if (void? path)
+              (if (null? next-gens)
+                  (values #f #f #f)
+                  (let ((n (car next-gens)))
+                    (set! gen (cadr n))
+                    (info-am "Walking ~a..." (car n))
+                    (set! next-gens (cdr next-gens))
+                    (walker-func)))
+              (let* ((bd (basedir path))
+                     (bn (format "~a" (basename path)))
+                     (nbn (filename-cleaner-func (clean-os-basename bn)))
                      )
-                (filter-func base-path path info))))
-        )
+
+                (unless (string=? bn nbn)
+                  (with-handlers ([exn? (λ (e)
+                                          (warn-am "Cannot rename dirty filename: ~a, ~a" nbn e))])
+                    (info-am "Renaming ~a to ~a (basedir: ~a)" bn nbn bd)
+                    (rename-file-or-directory (build-path bd bn)
+                                              (build-path bd nbn) #f)
+                    (set! path (build-path bd nbn))
+                    (when (directory-exists? path)
+                      (info-am "Adding directory ~a to next gens" nbn)
+                      (set! next-gens (cons (list
+                                             nbn
+                                             (make-next-gen path glob-pattern))
+                                            next-gens)))
+                    ))
+              
+                (let* ((str-path (path->string path))
+                       (ext* (path-get-extension path))
+                       (ext (string->symbol
+                             (substring
+                              (if (eq? ext* #f)
+                                  "."
+                                  (let ((e (string-downcase (bytes->string/utf-8 ext*))))
+                                    (if (string-contains? e " ")
+                                        "."
+                                        e))) 1)))
+                       (path-part (substring str-path base-path-len))
+                       (str-n-path (string-replace path-part "\\" "/"))
+                       (info (let ((h (make-hash (list
+                                                  (cons 'type 'dir)
+                                                  (cons 'path str-n-path)
+                                                  (cons 'ext ext)))))
+                               (when (file-exists? path)
+                                 (hash-set! h 'type 'file)
+                                 (hash-set! h 'size (file-size path))
+                                 (hash-set! h 'mtime (file-or-directory-modify-seconds path))
+                                 )
+                               h))
+                       )
+                  (filter-func base-path path info)))
+              )))))
+             walker-func
       )
-    )
-  )
+    ))
 
 (define (make-file-admin base-path db-store #:filename-cleaner [fc-f (λ (f) f)])