Folder creation moved to upload

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@122 f70e237a-67f3-0310-a06c-d2b8a7116972

2 files changed, 11 insertions, 20 deletions

diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index fcb483e..e1e0f93 100644
--- a/lib/feed2imap/feed2imap.rb
+++ b/lib/feed2imap/feed2imap.rb
@@ -98,16 +98,6 @@ class Feed2Imap
       end
     end
 
-    # check that IMAP folders exist
-    @logger.info("Checking IMAP folders ...")
-    @config.feeds.each do |f|
-      begin
-        f.imapaccount.create_folder(f.folder) if not f.imapaccount.folder_exist?(f.folder)
-      rescue
-        @logger.fatal("Error while creating IMAP folder #{f.folder}: #{$!}")
-        exit(1)
-      end
-    end
     # for each feed, fetch, upload to IMAP and cache
     @logger.info("Fetching and filtering feeds ...")
     ths = []
diff --git a/lib/feed2imap/imap.rb b/lib/feed2imap/imap.rb
index 933a561..3501530 100644
--- a/lib/feed2imap/imap.rb
+++ b/lib/feed2imap/imap.rb
@@ -50,6 +50,7 @@ class ImapAccount
 
   def initialize(uri)
     @uri = uri
+    @existing_folders = []
     self
   end
 
@@ -83,26 +84,26 @@ class ImapAccount
     end
   end
 
-  # Returns true if the folder exist
-  def folder_exist?(folder)
-    return !@connection.list('', folder).nil?
-  end
-
-  # Creates the given folder
-  def create_folder(folder)
-    @connection.create(folder)
-    @connection.subscribe(folder)
-    self
+  # tests if the folder exists and create it if not
+  def create_folder_if_not_exists(folder)
+    return if @existing_folders.include?(folder)
+    if !@connection.list('', folder).nil?
+      @connection.create(folder)
+      @connection.subscribe(folder)
+    end
+    @existing_folders << folder
   end
 
   # Put the mail in the given folder
   # You should check whether the folder exist first.
   def putmail(folder, mail, date = Time::now)
+    create_folder_if_not_exists(folder)
     @connection.append(folder, mail.gsub(/\n/, "\r\n"), nil, date)
   end
 
   # update a mail
   def updatemail(folder, mail, idx, date = Time::now)
+    create_folder_if_not_exists(folder)
     @connection.select(folder)
     searchres = @connection.search(['HEADER', 'X-CacheIndex', "-#{idx}-"])
     flags = nil