From e9fceea070ea2b9d4fd0db4194732fdfa3a030bb Mon Sep 17 00:00:00 2001
From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Fri, 14 Dec 2007 22:10:02 +0000
Subject: [PATCH] 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
---
 bin/sup-config         | 2 +-
 lib/sup/imap.rb        | 6 +-----
 lib/sup/mbox/loader.rb | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bin/sup-config b/bin/sup-config
index 57085fd..f978a6b 100644
--- 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 c54a2ea..d9a10a9 100644
--- 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 20bab2d..a66d7b9 100644
--- 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
 
-- 
2.45.2