bugfix: sup-config imap url parsing, and imap+mbox label suggestion

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@772 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup-config b/bin/sup-config
index 57085fd43042005cb19aa4cbf26abfabd54b973b..f978a6b5d6dc9831913d83e1eaeb9f6e49d059e2 100644 (file)
--- a/bin/sup-config
+++ b/bin/sup-config
@@ -96,7 +96,7 @@ def add_source
         $last_folder = fn
 
         fn = "/#{fn}" # lame
-        if srv =~ /^(\w+):(\d+)$/
+        if srv =~ /^(\S+):(\d+)$/
           host, port = $1, $2.to_i
         else
           host, port = srv, nil

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index c54a2ea6a21ae740c0e17168116214f67bc3a356..d9a10a9144d9bae516ee1563118ce19542f9a693 100644 (file)
--- a/lib/sup/imap.rb
+++ b/lib/sup/imap.rb
@@ -72,11 +72,7 @@ class IMAP < Source
   end
 
   def self.suggest_labels_for path
-    if path =~ /inbox/i
-      [path.intern]
-    else
-      []
-    end
+    path =~ /([^\/]*inbox[^\/]*)/i ? [$1.downcase.intern] : []
   end
 
   def host; @parsed_uri.host; end

diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
index 20bab2d20fce88d61723faa39e75914fb6ca2b86..a66d7b906004f57b612c4888bc3111c674906547 100644 (file)
--- a/lib/sup/mbox/loader.rb
+++ b/lib/sup/mbox/loader.rb
@@ -37,7 +37,7 @@ class Loader < Source
     if File.dirname(path) =~ /\b(var|usr|spool)\b/
       []
     else
-      [File.basename(path).intern]
+      [File.basename(path).downcase.intern]
     end
   end