sup 0.0.4 → 0.0.5

data/lib/sup/person.rb

@@ -10,7 +10,7 @@ class PersonManager
     self.class.i_am_the_instance self
   end
 
-  def name_for email; @names.member?(email) && @names[email][1]; end
+  def name_for email; @names.member?(email) ? @names[email][1] : nil; end
   def register email, name
     return unless name
 

data/lib/sup/poll.rb

@@ -8,16 +8,14 @@ class PollManager
   DELAY = 300
 
   def initialize
-    @polling = false
+    @mutex = Mutex.new
     @last_poll = nil
     
     self.class.i_am_the_instance self
   end
 
   def buffer
-    BufferManager.spawn_unless_exists("<poll for new messages>", :hidden => true) do
-      PollMode.new
-    end
+    BufferManager.spawn_unless_exists("<poll for new messages>", :hidden => true) { PollMode.new }
   end
 
   def poll
@@ -40,55 +38,65 @@ class PollManager
     end
   end
 
+  ## TODO: merge this with sup-import
   def do_poll
-    return [0, 0] if @polling
-    @polling = true
-    found = {}
-    total_num = 0
-    total_numi = 0
+    total_num = total_numi = 0
+    @mutex.synchronize do
+      found = {}
+      Index.usual_sources.each do |source|
+        next if source.broken? || source.done?
+
+        yield "Loading from #{source}... "
+        start_offset = nil
+        num = 0
+        num_inbox = 0
 
-    Index.usual_sources.each do |source|
-      next if source.done?
-      yield "Loading from #{source}... "
+        source.each do |offset, labels|
+          break if source.broken?
+          start_offset ||= offset
+          yield "Found message at #{offset} with labels #{labels * ', '}"
 
-      start_offset = nil
-      num = 0
-      num_inbox = 0
-      source.each do |offset, labels|
-        start_offset ||= offset
-        yield "Found message at #{offset} with labels #{labels * ', '}"
-        begin
-          m = Redwood::Message.new :source => source, :source_info => offset,
-                                   :labels => labels
-          if found[m.id]
-            yield "Skipping duplicate message #{m.id}"
-            next
-          else
+          begin
+            begin
+              m = Redwood::Message.new :source => source, :source_info => offset, :labels => labels
+            rescue MessageFormatError => e
+              yield "Non-fatal error loading message #{source}##{offset}: #{e.message}"
+              next
+            end
+
+            if found[m.id]
+              yield "Skipping duplicate message #{m.id}"
+              next
+            end
             found[m.id] = true
-          end
           
-          if Index.add_message m
-            UpdateManager.relay :add, m
-            num += 1
-            total_num += 1
-            total_numi += 1 if m.labels.include? :inbox
+            if Index.add_message m
+              UpdateManager.relay :add, m
+              num += 1
+              total_num += 1
+              total_numi += 1 if m.labels.include? :inbox
+            end
+        
+            if num % 1000 == 0 && num > 0
+              elapsed = Time.now - start
+              pctdone = source.pct_done
+              remaining = (100.0 - pctdone) * (elapsed.to_f / pctdone)
+              yield "## #{num} (#{pctdone}% done) read; #{elapsed.to_time_s} elapsed; est. #{remaining.to_time_s} remaining"
+            end
+          rescue SourceError => e
+            msg = "Fatal error loading from #{source}: #{e.message}"
+            Redwood::log msg
+            yield msg
+            break
           end
-        rescue SourceError, MessageFormatError => e
-          yield "Ignoring erroneous message at #{source}##{offset}: #{e.message}"
-        end
-
-        if num % 1000 == 0 && num > 0
-          elapsed = Time.now - start
-          pctdone = (offset.to_f - start_offset) / (source.total.to_f - start_offset)
-          remaining = (source.end_offset.to_f - offset.to_f) * (elapsed.to_f / (offset.to_f - start_offset))
-          yield "## #{num} (#{(pctdone * 100.0)}% done) read; #{elapsed.to_time_s} elapsed; est. #{remaining.to_time_s} remaining"
         end
+        yield "Found #{num} messages" unless num == 0
       end
-      yield "Found #{num} messages" unless num == 0
+
+      yield "Done polling; loaded #{total_num} new messages total"
+      @last_poll = Time.now
+      @polling = false
     end
-    yield "Done polling; loaded #{total_num} new messages total"
-    @last_poll = Time.now
-    @polling = false
     [total_num, total_numi]
   end
 end

data/lib/sup/thread.rb

@@ -7,7 +7,9 @@ class Thread
 
   attr_reader :containers
   def initialize
-    raise "wrong thread, buddy!" if block_given?
+    ## ah, the joys of a multithreaded application with a class called
+    ## "Thread". i keep instantiating the wrong one...
+    raise "wrong Thread class, buddy!" if block_given?
     @containers = []
   end
 
@@ -28,7 +30,9 @@ class Thread
     puts "=== end thread ==="
   end
 
-  ## yields each message and some stuff
+  ## yields each message, its depth, and its parent
+  ## note that the message can be a Message object, or :fake_root,
+  ## or nil.
   def each fake_root=false
     adj = 0
     root = @containers.find_all { |c| !Message.subj_is_reply?(c) }.argmin { |c| c.date }
@@ -78,6 +82,7 @@ class Thread
   def set_labels l; each { |m, *o| m && m.labels = l }; end
   
   def has_label? t; any? { |m, *o| m && m.has_label?(t) }; end
+  def dirty?; any? { |m, *o| m && m.dirty? }; end
   def save index; each { |m, *o| m && m.save(index) }; end
 
   def direct_participants

data/lib/sup/util.rb

@@ -224,16 +224,16 @@ class Time
         ["minute", 60],
         ["hour", 24],
         ["day", 7],
-        ["week", 4], # heh heh
+        ["week", 4.345], # heh heh
         ["month", 12],
         ["year", nil],
       ].argfind do |unit, size|
-        if diff <= 1
+        if diff.round <= 1
           "one #{unit}"
-        elsif size.nil? || diff < size
-          "#{diff} #{unit}s"
+        elsif size.nil? || diff.round < size
+          "#{diff.round} #{unit}s"
         else
-          diff = (diff / size.to_f).round
+          diff /= size.to_f
           false
         end
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sup
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-01-03 00:00:00 -08:00
+  version: 0.0.5
+date: 2007-01-05 00:00:00 -08:00
 summary: A console-based email client with the best features of GMail, mutt, and emacs. Features full text search, labels, tagged operations, multiple buffers, recent contacts, and more.
 require_paths: 
 - lib