X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fsup%2Fimap.rb;h=bdb9e15b52fec1971b7e705ffa5e0ac6988e5446;hb=ef1d8a9333f8d261deeb88a7c1cb0cc58d7b6563;hp=e785597ab086402712ae5e834eb1be37a7236e85;hpb=6a07133ba73393c4f0c05b1e067fef8dd2f595a2;p=sup diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb index e785597..bdb9e15 100644 --- a/lib/sup/imap.rb +++ b/lib/sup/imap.rb @@ -4,6 +4,10 @@ require 'stringio' require 'time' require 'rmail' require 'cgi' +require 'set' + +## TODO: remove synchronized method protector calls; use a Monitor instead +## (ruby's reentrant mutex) ## fucking imap fucking sucks. what the FUCK kind of committee of dunces ## designed this shit. @@ -15,7 +19,7 @@ require 'cgi' ## restriction. it can change any time you log in. it can change EVERY ## time you log in. of course the imap spec "strongly recommends" that it ## never change, but there's nothing to stop people from just setting it -## to the current timestamp, and in fact that's exactly what the one imap +## to the current timestamp, and in fact that's EXACTLY what the one imap ## server i have at my disposal does. thus the so-called uids are ## absolutely useless and imap provides no cross-session way of uniquely ## identifying a message. but thanks for the "strong recommendation", @@ -44,6 +48,7 @@ require 'cgi' module Redwood class IMAP < Source + include SerializeLabelsNicely SCAN_INTERVAL = 60 # seconds ## upon these errors we'll try to rereconnect a few times @@ -66,7 +71,7 @@ class IMAP < Source @imap_state = {} @ids = [] @last_scan = nil - @labels = ((labels || []) - LabelManager::RESERVED_LABELS).uniq.freeze + @labels = Set.new((labels || []) - LabelManager::RESERVED_LABELS) @say_id = nil @mutex = Mutex.new end @@ -90,7 +95,7 @@ class IMAP < Source def == o; o.is_a?(IMAP) && o.uri == self.uri && o.username == self.username; end def load_header id - MBox::read_header StringIO.new(raw_header(id)) + parse_raw_email_header StringIO.new(raw_header(id)) end def load_message id @@ -108,36 +113,61 @@ class IMAP < Source end synchronized :raw_header + def store_message date, from_email, &block + message = StringIO.new + yield message + message.string.gsub! /\n/, "\r\n" + + safely { @imap.append mailbox, message.string, [:Seen], Time.now } + end + def raw_message id unsynchronized_scan_mailbox get_imap_fields(id, 'RFC822').first.gsub(/\r\n/, "\n") end synchronized :raw_message + def mark_as_deleted ids + ids = [ids].flatten # accept single arguments + unsynchronized_scan_mailbox + imap_ids = ids.map { |i| @imap_state[i] && @imap_state[i][:id] }.compact + return if imap_ids.empty? + @imap.store imap_ids, "+FLAGS", [:Deleted] + end + synchronized :mark_as_deleted + + def expunge + @imap.expunge + unsynchronized_scan_mailbox true + true + end + synchronized :expunge + def connect return if @imap safely { } # do nothing! end synchronized :connect - def scan_mailbox - return if @last_scan && (Time.now - @last_scan) < SCAN_INTERVAL + def scan_mailbox force=false + return if !force && @last_scan && (Time.now - @last_scan) < SCAN_INTERVAL last_id = safely do @imap.examine mailbox @imap.responses["EXISTS"].last end @last_scan = Time.now + @ids = [] if force return if last_id == @ids.length range = (@ids.length + 1) .. last_id - Redwood::log "fetching IMAP headers #{range}" + debug "fetching IMAP headers #{range}" fetch(range, ['RFC822.SIZE', 'INTERNALDATE', 'FLAGS']).each do |v| id = make_id v @ids << id @imap_state[id] = { :id => v.seqno, :flags => v.attr["FLAGS"] } end - Redwood::log "done fetching IMAP headers" + debug "done fetching IMAP headers" end synchronized :scan_mailbox @@ -176,7 +206,7 @@ class IMAP < Source def end_offset unsynchronized_scan_mailbox - @ids.last + @ids.last + 1 end synchronized :end_offset @@ -196,7 +226,7 @@ private if good_results.empty? raise FatalSourceError, "no IMAP response for #{ids} containing all fields #{fields.join(', ')} (got #{results.size} results)" elsif good_results.size < results.size - Redwood::log "Your IMAP server sucks. It sent #{results.size} results for a request for #{good_results.size} messages. What are you using, Binc?" + warn "Your IMAP server sucks. It sent #{results.size} results for a request for #{good_results.size} messages. What are you using, Binc?" end good_results @@ -224,12 +254,12 @@ private raise Net::IMAP::NoResponseError unless @imap.capability().member? "AUTH=CRAM-MD5" @imap.authenticate 'CRAM-MD5', @username, @password rescue Net::IMAP::BadResponseError, Net::IMAP::NoResponseError => e - Redwood::log "CRAM-MD5 authentication failed: #{e.class}. Trying LOGIN auth..." + debug "CRAM-MD5 authentication failed: #{e.class}. Trying LOGIN auth..." begin raise Net::IMAP::NoResponseError unless @imap.capability().member? "AUTH=LOGIN" @imap.authenticate 'LOGIN', @username, @password rescue Net::IMAP::BadResponseError, Net::IMAP::NoResponseError => e - Redwood::log "LOGIN authentication failed: #{e.class}. Trying plain-text LOGIN..." + debug "LOGIN authentication failed: #{e.class}. Trying plain-text LOGIN..." @imap.login @username, @password end end @@ -246,7 +276,7 @@ private def say s @say_id = BufferManager.say s, @say_id if BufferManager.instantiated? - Redwood::log s + info s end def shutup @@ -259,7 +289,7 @@ private %w(RFC822.SIZE INTERNALDATE).each do |w| raise FatalSourceError, "requested data not in IMAP response: #{w}" unless imap_stuff.attr[w] end - + msize, mdate = imap_stuff.attr['RFC822.SIZE'] % 10000000, Time.parse(imap_stuff.attr["INTERNALDATE"]) sprintf("%d%07d", mdate.to_i, msize).to_i end @@ -303,7 +333,7 @@ private rescue *RECOVERABLE_ERRORS => e if (retries += 1) <= 3 @imap = nil - Redwood::log "got #{e.class.name}: #{e.message.inspect}" + warn "got #{e.class.name}: #{e.message.inspect}" sleep 2 retry end