1 files changed, 29 insertions, 11 deletions
diff --git a/lib/MaildirIndexer/ScanDir.rakumod b/lib/MaildirIndexer/ScanDir.rakumod
index b21fd81..c45d787 100644
--- a/lib/MaildirIndexer/ScanDir.rakumod
+++ b/lib/MaildirIndexer/ScanDir.rakumod
@@ -1,34 +1,52 @@
 use v6.d;
 unit module MaildirIndexer::ScanDir;
 
+class End {};
+
 sub scan-dir(IO() $path --> Supply) is export {
     supply {
         my %watched-dirs;
 
-        sub add-dir(IO::Path $dir, :$initial) {
-            %watched-dirs{$dir} = True;
+        CATCH { when X::IO { }; default { warn $_; done } }
 
-            CATCH { when X::IO::Dir { }; default { warn $_ } }
+        sub start-watching(IO::Path $dir) {
+            %watched-dirs{$dir.Str} = True;
             
             whenever $dir.watch {
                 my $path-io = .path.IO;
                 emit $path-io;
-                when $path-io.e && $path-io.d {
-                    add-dir($path-io) unless %watched-dirs{$path-io};
+                when $path-io ~~ :e & :d {
+                    add-dir($path-io) unless %watched-dirs{$path-io.Str};
                 }
-                when !$path-io.e {
-                    %watched-dirs{$path-io}:delete
+                when $path-io ~~ :!e {
+                    %watched-dirs{$path-io.Str}:delete
                 }
             }
+        }
+
+        sub add-dir(IO::Path $dir) {
+            my @todo = $dir;
+
+            while @todo {
+                my $next = @todo.shift;
 
-            for $dir.dir {
-                emit $_;
-                when .e && .d {
-                    add-dir($_);
+                emit $next;
+
+                next unless $next ~~ :e & :r & :d;
+                start-watching($next);
+
+                for $next.dir {
+                    emit $_;
+                    when .e && .d {
+                        @todo.push($_);
+                        start-watching($_);
+                    }
                 }
             }
+
         }
 
         add-dir($path);
+        emit End;
     }
 }