bugfix: thread ordering in thread-index-mode "jumping around"

[sup] / lib / sup / draft.rb

diff --git a/lib/sup/draft.rb b/lib/sup/draft.rb
index 8a303b434d17e10212f92b04ed890877c4b930b4..8d3c4a53f77548b7af11568aeb638de4523a4f49 100644 (file)
--- a/lib/sup/draft.rb
+++ b/lib/sup/draft.rb
@@ -23,20 +23,20 @@ class DraftManager
     @source.each do |thisoffset, theselabels|
       m = Message.new :source => @source, :source_info => thisoffset, :labels => theselabels
       Index.sync_message m
-      UpdateManager.relay self, :add, m
+      UpdateManager.relay self, :added, m
       my_message = m if thisoffset == offset
     end
 
     my_message
   end
 
-  def discard mid
-    docid, entry = Index.load_entry_for_id mid
-    raise ArgumentError, "can't find entry for draft: #{mid.inspect}" unless entry
-    raise ArgumentError, "not a draft: source id #{entry[:source_id].inspect}, should be #{DraftManager.source_id.inspect} for #{mid.inspect} / docno #{docid}" unless entry[:source_id].to_i == DraftManager.source_id
+  def discard m
+    docid, entry = Index.load_entry_for_id m.id
+    raise ArgumentError, "can't find entry for draft: #{m.id.inspect}" unless entry
+    raise ArgumentError, "not a draft: source id #{entry[:source_id].inspect}, should be #{DraftManager.source_id.inspect} for #{m.id.inspect} / docno #{docid}" unless entry[:source_id].to_i == DraftManager.source_id
     Index.drop_entry docid
     File.delete @source.fn_for_offset(entry[:source_info])
-    UpdateManager.relay self, :delete, mid
+    UpdateManager.relay self, :deleted, m
   end
 end
 
@@ -47,7 +47,7 @@ class DraftLoader < Source
   def initialize cur_offset=0
     dir = Redwood::DRAFT_DIR
     Dir.mkdir dir unless File.exists? dir
-    super "draft://#{dir}", cur_offset, true, false
+    super DraftManager.source_name, cur_offset, true, false
     @dir = dir
   end
 
@@ -99,7 +99,13 @@ class DraftLoader < Source
     ret
   end
 
-  def raw_full_message offset
+  def each_raw_message_line offset
+    File.open(fn_for_offset(offset)) do |f|
+      yield f.gets until f.eof?
+    end
+  end
+
+  def raw_message offset
     IO.readlines(fn_for_offset(offset)).join
   end