imapget 0.0.4 → 0.0.5

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to imapget version 0.0.4
+This documentation refers to imapget version 0.0.5
 
 
 == DESCRIPTION
@@ -27,7 +27,7 @@ Rubyforge project:: <http://rubyforge.org/projects/imapget>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2009 Jens Wille,
+Copyright (C) 2009 Jens Wille
 
 imapget is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software

data/bin/imapget

@@ -93,6 +93,8 @@ profiles.each { |profile|
 
   config.update(default_config) { |key, old, new| old }
 
+  next if config[:skip]
+
   unless host = config[:host]
     warn "No host for profile #{profile}"
     next

data/lib/imapget/version.rb

@@ -4,7 +4,7 @@ class IMAPGet
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     class << self
 

data/lib/imapget.rb

@@ -27,6 +27,7 @@
 require 'time'
 require 'net/imap'
 require 'fileutils'
+require 'enumerator' unless [].respond_to?(:each_slice)
 
 require 'imapget/version'
 
@@ -37,28 +38,21 @@ class IMAPGet
   STRATEGIES       = [:include, :exclude]
   DEFAULT_STRATEGY = :exclude
 
+  DEFAULT_LEVEL = 2
   DEFAULT_DELIM = '/'
 
+  FETCH_ATTR = %w[FLAGS INTERNALDATE RFC822]
+  FETCH_SIZE = 100
+
   attr_reader   :imap, :strategy, :incl, :excl
   attr_accessor :log_level
 
   def initialize(options)
-    @imap = Net::IMAP.new(
-      options[:host],
-      options[:port] || Net::IMAP::PORT,
-      options[:use_ssl],
-      options[:certs],
-      options[:verify]
-    )
+    @log_level = options[:log_level] || DEFAULT_LEVEL
 
-    @imap.authenticate(
-      @imap.capability.include?('AUTH=CRAM-MD5') ? 'CRAM-MD5' : 'LOGIN',
-      options[:user], options[:password]
-    )
-
-    inclexcl(options)
-
-    @log_level = 2
+    init_imap    options
+    authenticate options
+    inclexcl     options
   end
 
   def inclexcl(options)
@@ -109,7 +103,7 @@ class IMAPGet
       when Net::IMAP::MailboxList then mailbox_or_name.name
       when String                 then mailbox_or_name
       else
-        raise TypeError, "String or MailboxList expected, got #{mailbox_or_name.class}"
+        raise TypeError, "MailboxList or String expected, got #{mailbox_or_name.class}"
     end
 
     case strategy
@@ -122,30 +116,20 @@ class IMAPGet
 
   def get(path)
     each { |mailbox|
-      name = mailbox.name
-      dir  = File.join(path, Net::IMAP.decode_utf7(name))
-
-      if File.directory?(dir)
-        last_update = File.mtime(dir)
-      else
-        FileUtils.mkdir_p(dir)
-        last_update = Time.at(0)
-      end
+      name   = mailbox.name
+      dir    = File.join(path, Net::IMAP.decode_utf7(name))
+      update = check_dir(dir)
 
       log "#{'=' * 10} #{name} #{'=' * 10}"
       imap.examine(name)
 
-      uids = imap.uid_search("SINCE #{last_update.utc.strftime('%d-%b-%Y')}")
+      uids = imap.uid_search("SINCE #{update.strftime('%d-%b-%Y')}")
       next if uids.empty?
 
-      imap.uid_fetch(uids, %w[RFC822 INTERNALDATE FLAGS]).each { |mail|
-        uid   = mail.attr['UID']
-        flags = mail.attr['FLAGS']
-        file  = File.join(dir, uid.to_s)
-        date  = Time.parse(mail.attr['INTERNALDATE'])
-
-        deleted = flags.include?(Net::IMAP::DELETED)
+      fetch(uids) { |mail, uid, flags, date, body|
+        file    = File.join(dir, uid.to_s)
         exists  = File.exists?(file)
+        deleted = flags.include?(Net::IMAP::DELETED)
 
         if deleted
           if exists
@@ -155,7 +139,7 @@ class IMAPGet
         else
           unless exists && File.mtime(file) >= date
             info "#{dir}: #{name} -> #{uid}"
-            File.open(file, 'w') { |f| f.puts mail.attr['RFC822'] }
+            File.open(file, 'w') { |f| f.puts body }
           end
         end
       }
@@ -166,6 +150,44 @@ class IMAPGet
 
   private
 
+  def init_imap(options)
+    @imap = Net::IMAP.new(
+      options[:host],
+      options[:port] || Net::IMAP::PORT,
+      options[:use_ssl],
+      options[:certs],
+      options[:verify]
+    )
+  end
+
+  def authenticate(options)
+    imap.authenticate(
+      imap.capability.include?('AUTH=CRAM-MD5') ? 'CRAM-MD5' : 'LOGIN',
+      options[:user], options[:password]
+    )
+  end
+
+  def fetch(uids, fetch_size = FETCH_SIZE, fetch_attr = FETCH_ATTR)
+    uids.each_slice(fetch_size) { |slice|
+      imap.uid_fetch(slice, fetch_attr).each { |mail|
+        yield mail, *['UID', *fetch_attr].map { |a|
+          v = mail.attr[a]
+          v = Time.parse(v) if a == 'INTERNALDATE'
+          v
+        }
+      }
+    }
+  end
+
+  def check_dir(dir)
+    if File.directory?(dir)
+      File.mtime(dir)
+    else
+      FileUtils.mkdir_p(dir)
+      Time.at(0)
+    end.utc
+  end
+
   def log(msg, level = 1)
     warn msg if log_level >= level
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imapget
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 +02:00
+date: 2009-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency