From mboxrd@z Thu Jan  1 00:00:00 1970
From: grant@antiflux.org (Grant Hollingworth)
Date: Fri, 18 Jan 2008 12:06:49 -0500
Subject: [sup-talk] [PATCH] return sources in id-order,
	with non-archived sources first
Message-ID: <1200675726-sup-4860@spooky.local>

To speed up the user's view of polling, deal with sources that affect the
inbox before (for example) large mailing lists. It seemed tidier to implement
this in Index rather than PollManager.

I changed "@sources.values" to "sources" in some other methods for clarity,
which I think in this case outweighs lost efficiency.

---
 lib/sup/index.rb |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/sup/index.rb b/lib/sup/index.rb
index 1997c92..b2a1612 100644
--- a/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@ -125,9 +125,13 @@ EOS
     @sources[source.id] = source
   end
 
-  def source_for uri; @sources.values.find { |s| s.is_source_for? uri }; end
-  def usual_sources; @sources.values.find_all { |s| s.usual? }; end
-  def sources; @sources.values; end
+  def sources
+    ## favour the inbox by listing non-archived sources first
+    @sources.values.sort_by {|s| s.id }.partition {|s| !s.archived? }.flatten
+  end
+  
+  def source_for uri; sources.find { |s| s.is_source_for? uri }; end
+  def usual_sources; sources.find_all { |s| s.usual? }; end
 
   def load_index dir=File.join(@dir, "ferret")
     if File.exists? dir
@@ -512,7 +516,7 @@ protected
         File.chmod 0600, fn
         FileUtils.mv fn, bakfn, :force => true unless File.exists?(bakfn) && File.size(fn) == 0
       end
-      Redwood::save_yaml_obj @sources.values.sort_by { |s| s.id.to_i }, fn, true
+      Redwood::save_yaml_obj sources.sort_by { |s| s.id.to_i }, fn, true
       File.chmod 0600, fn
     end
     @sources_dirty = false
-- 
1.5.3.7