sup

commit d963bd3760f48aee19227c24596fc1654adeccf2
parent f357999ec46b14482ec566b8ba65047812cfabaa
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date:   Wed, 24 Mar 2010 23:45:20 -0700

maildir directory mtime optimization

Diffstat:

1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb
@@ -20,6 +20,7 @@ class Maildir < Source
     @dir = uri.path
     @labels = Set.new(labels || [])
     @mutex = Mutex.new
+    @mtimes = { 'cur' => Time.at(0), 'new' => Time.at(0) }
   end
 
   def file_path; @dir end
@@ -86,13 +87,20 @@ class Maildir < Source
 
   ## XXX use less memory
   def each
-    old_ids = benchmark(:index) { Enumerator.new(Index, :each_source_info, self.id).to_a }
-    new_ids = benchmark(:glob) { Dir.glob("#{@dir}/*/*").map { |x| x[@dir.length..-1] }.sort }
-    added = new_ids - old_ids
-    deleted = old_ids - new_ids
-    info "#{added.size} added, #{deleted.size} deleted"
-    added.each do |id|
-      yield id, @labels + (seen?(id) ? [] : [:unread]) + (trashed?(id) ? [:deleted] : []) + (flagged?(id) ? [:starred] : [])
+    @mtimes.each do |d,prev_mtime|
+      subdir = File.join @dir, d
+      raise FatalSourceError, "#{subdir} not a directory" unless File.directory? subdir
+      mtime = File.mtime subdir
+      next if prev_mtime >= mtime
+      @mtimes[d] = mtime
+      old_ids = benchmark(:index) { Enumerator.new(Index, :each_source_info, self.id, "#{subdir}/").to_a }
+      new_ids = benchmark(:glob) { Dir.glob("#{@dir}/#{subdir}/*").map { |x| x[@dir.length..-1] }.sort }
+      added = new_ids - old_ids
+      deleted = old_ids - new_ids
+      info "#{added.size} added, #{deleted.size} deleted"
+      added.each do |id|
+        yield id, @labels + (seen?(id) ? [] : [:unread]) + (trashed?(id) ? [:deleted] : []) + (flagged?(id) ? [:starred] : [])
+      end
     end
     nil
   end