mournmail 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422feadab2e36499c76f69f1836ce4e384497f0e86814cb4c20d0966e70b69b8
-  data.tar.gz: 82423aa120aef42601ef86737e8461b96c32f786d9e7e647c80a4dfdc14a93f1
+  metadata.gz: f3e35ed64af5fb25eeedad4c3c901b93125baf6b561b8e2384da7a9ed602b367
+  data.tar.gz: 9174888f40a57d0cffe48d13fef7cc0d2892be312d3ff0b95a0df7aef098c726
 SHA512:
-  metadata.gz: 7a4bba313e307593fad8635b6f284bbc58a79087adad0671849bbf3ec416e554ba7c4af258f4b6556606262897035a08313d5f40754cde56bf8652555049ef09
-  data.tar.gz: 6a30de329d0dc20d86954c1cb8d881bfe15b8309931f2fbba98cdd1a690aa53d6eab1f345b86822c2a6de19905e357232fea1e2092077d866b1f9c4fc2a630d1
+  metadata.gz: f85ebaadd8f97a43e45856347ad0149594ab17db31c04ba66d85db61b336f3c7cd4548c725868a44522d87941297edc5ad5656901440400f834017ed2e650733
+  data.tar.gz: ddff53280fad3432e0bf0da11cf58c57a60586886828fa512b1bf54cba8e57afc8e2687561ae8b289d95fde271b1679f7da4de56e451b4fd6c00ec9787ccd095

data/lib/mournmail.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative "mournmail/version"
 require_relative "mournmail/config"
 require_relative "mournmail/faces"

data/lib/mournmail/commands.rb

@@ -1,13 +1,14 @@
-# frozen_string_literal: true
-
 define_command(:mournmail, doc: "Start mournmail.") do
   Mournmail.open_groonga_db
   mournmail_visit_mailbox("INBOX")
 end
 
-define_command(:mournmail_visit_mailbox, doc: "Start mournmail.") do
+define_command(:mournmail_visit_mailbox, doc: "Visit mailbox") do
   |mailbox = Mournmail.read_mailbox_name("Visit mailbox: ", default: "INBOX")|
-  mournmail_summary_sync(mailbox)
+  summary = Mournmail::Summary.load_or_new(mailbox)
+  foreground do
+    Mournmail.show_summary(summary)
+  end
 end
 
 define_command(:mournmail_summary_sync, doc: "Sync summary.") do
@@ -16,30 +17,10 @@ define_command(:mournmail_summary_sync, doc: "Sync summary.") do
   message("Syncing #{mailbox} in background...")
   Mournmail.background do
     summary = Mournmail.fetch_summary(mailbox, all: all)
-    summary_text = summary.to_s
     summary.save
-    next_tick do
-      buffer = Buffer.find_or_new("*summary*", undo_limit: 0,
-                                  read_only: true)
-      buffer.apply_mode(Mournmail::SummaryMode)
-      buffer.read_only_edit do
-        buffer.clear
-        buffer.insert(summary_text)
-      end
-      switch_to_buffer(buffer)
-      Mournmail.current_mailbox = mailbox
-      Mournmail.current_summary = summary
-      Mournmail.current_mail = nil
-      Mournmail.current_uid = nil
+    foreground do
+      Mournmail.show_summary(summary)
       message("Syncing #{mailbox} in background... Done")
-      begin
-        buffer.beginning_of_buffer
-        buffer.re_search_forward(/^ *\d+ u/)
-      rescue SearchError
-        buffer.end_of_buffer
-        buffer.re_search_backward(/^ *\d+ /, raise_error: false)
-      end
-      summary_read_command
     end
   end
 end

data/lib/mournmail/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   CONFIG[:mournmail_directory] = File.expand_path("~/.mournmail")
   CONFIG[:mournmail_accounts] = {}
@@ -18,7 +16,16 @@ module Textbringer
   ]
   CONFIG[:mournmail_imap_connect_timeout] = 10
   CONFIG[:mournmail_keep_alive_interval] = 60
-  CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
-  CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
+  case RUBY_PLATFORM
+  when /mswin|mingw/
+    CONFIG[:mournmail_file_open_comamnd] = "start"
+    CONFIG[:mournmail_link_open_comamnd] = "start"
+  when /darwin/
+    CONFIG[:mournmail_file_open_comamnd] = "open"
+    CONFIG[:mournmail_link_open_comamnd] = "open"
+  else
+    CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
+    CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
+  end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
 end

data/lib/mournmail/draft_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Mournmail
   class DraftMode < Textbringer::Mode
     MAIL_MODE_MAP = Keymap.new
@@ -70,10 +68,15 @@ module Mournmail
                    encoding: "binary")
       end
       conf = Mournmail.account_config
+      options = @buffer[:mournmail_delivery_options] ||
+        conf[:delivery_options]
+      if options[:authentication] == "gmail"
+        options = options.merge(authentication: "xoauth2",
+                                password: Mournmail.google_access_token)
+      end
       m.delivery_method(@buffer[:mournmail_delivery_method] ||
                         conf[:delivery_method],
-                        @buffer[:mournmail_delivery_options] ||
-                        conf[:delivery_options])
+                        options)
       bury_buffer(@buffer)
       background do
         begin
@@ -89,9 +92,11 @@ module Mournmail
             m.gpg(sign: pgp_sign, encrypt: pgp_encrypt)
           end
           m.deliver
-          next_tick do
+          foreground do
             message("Mail sent.")
           end
+          cache_id = Mournmail.write_mail_cache(m.encoded)
+          Mournmail.index_mail(cache_id, m)
           outbox = Mournmail.account_config[:outbox_mailbox]
           if outbox
             Mournmail.imap_connect do |imap|
@@ -101,12 +106,12 @@ module Mournmail
               imap.append(outbox, m.to_s, [:Seen])
             end
           end
-          next_tick do
+          foreground do
             kill_buffer(@buffer, force: true)
             Mournmail.back_to_summary
           end
         rescue Exception
-          next_tick do
+          foreground do
             switch_to_buffer(@buffer)
           end
           raise
@@ -141,10 +146,15 @@ module Mournmail
         start_pos = @buffer.point
         s = @buffer.substring(start_pos, end_pos)
         if !s.empty?
-          re = /^(.*")?#{Regexp.quote(s)}.*/
-          line = File.read(CONFIG[:mournmail_addresses_path]).slice(re)
-          if line
-            addr = line.slice(/^\S+/)
+          re = /^(?:.*")?#{Regexp.quote(s)}.*/
+          addrs = File.read(CONFIG[:mournmail_addresses_path])
+            .scan(re).map { |line| line.slice(/^\S+/) }
+          if !addrs.empty?
+            addr = addrs.inject { |x, y|
+              x.chars.zip(y.chars).take_while { |i, j|
+                i == j
+              }.map { |i,| i }.join
+            }
             @buffer.delete_region(start_pos, end_pos)
             @buffer.insert(addr)
           else

data/lib/mournmail/faces.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   Face.define :seen, foreground: "blue"
   Face.define :deleted, foreground: "green"

data/lib/mournmail/mail_encoded_word_patch.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "mail"
 
 module Mournmail
@@ -22,7 +20,7 @@ module Mournmail
       b_encoding_extra_size = "=?#{charset}?B??=".bytesize
       while !words.empty?
         limit = 78 - prepend
-        line = String.new
+        line = +""
         fold_line = false
         while !fold_line && !words.empty?
           word = words.first

data/lib/mournmail/message_mode.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: true
+require "uri"
+require "mime/types"
 
 using Mournmail::MessageRendering
 
@@ -7,14 +8,17 @@ module Mournmail
     MESSAGE_MODE_MAP = Keymap.new
     MESSAGE_MODE_MAP.define_key("\C-m", :message_open_link_or_part_command)
     MESSAGE_MODE_MAP.define_key("s", :message_save_part_command)
+    MESSAGE_MODE_MAP.define_key("\t", :message_next_link_or_part_command)
 
     # See http://nihongo.jp/support/mail_guide/dev_guide.txt
-    URI_REGEXP = /(https?|ftp):\/\/[^ 　\t\n>)"]*[^] 　\t\n>.,:)"]+/
+    MAILTO_REGEXP = URI.regexp("mailto")
+    URI_REGEXP = /(https?|ftp):\/\/[^ 　\t\n>)"]*[^] 　\t\n>.,:)"]+|#{MAILTO_REGEXP}/
+    MIME_REGEXP = /^\[(([\-0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
+    URI_OR_MIME_REGEXP = /#{URI_REGEXP}|#{MIME_REGEXP}/
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
-    define_syntax :mime_part,
-      /^\[(([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
+    define_syntax :mime_part, MIME_REGEXP
     define_syntax :link, URI_REGEXP
 
     def initialize(buffer)
@@ -46,12 +50,21 @@ module Mournmail
       end
     end
 
+    define_local_command(:message_next_link_or_part,
+                         doc: "Go to the next link or MIME part.") do
+      if @buffer.re_search_forward(URI_OR_MIME_REGEXP, raise_error: false)
+        goto_char(@buffer.match_beginning(0))
+      else
+        @buffer.beginning_of_buffer
+      end
+    end
+
     private
 
     def current_part
       @buffer.save_excursion do
         @buffer.beginning_of_line
-        if @buffer.looking_at?(/\[([0-9.]+) .*\]/)
+        if @buffer.looking_at?(/\[([\-0-9.]+) .*\]/)
           index = match_string(1)
           indices = index.split(".").map(&:to_i)
           @buffer[:mournmail_mail].dig_part(*indices)
@@ -75,7 +88,12 @@ module Mournmail
     end
 
     def part_default_file_name(part)
-      base_name = part.cid.gsub(/[^A-Za-z0-9_\-]/, "_")
+      base_name =
+        begin
+          part.cid.gsub(/[^A-Za-z0-9_\-]/, "_")
+        rescue NoMethodError
+          "mournmail"
+        end
       ext = part_extension(part)
       if ext
         base_name + "." + ext
@@ -126,8 +144,24 @@ module Mournmail
     end
 
     def open_uri(uri)
-      system(*CONFIG[:mournmail_link_open_comamnd], uri,
-             out: File::NULL, err: File::NULL)
+      case uri
+      when /\Amailto:/
+        u = URI.parse(uri)
+        if u.headers.assoc("subject")
+          re = /^To:\s*\nSubject:\s*\n/
+        else
+          re = /^To:\s*\n/
+        end
+        Commands.mail
+        beginning_of_buffer
+        re_search_forward(re)
+        replace_match("")
+        insert u.to_mailtext.sub(/\n\n\z/, "")
+        end_of_buffer
+      else
+        system(*CONFIG[:mournmail_link_open_comamnd], uri,
+               out: File::NULL, err: File::NULL)
+      end
     end
   end
 end

data/lib/mournmail/message_rendering.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "mail"
 
 module Mournmail
@@ -31,9 +29,14 @@ module Mournmail
           parts.each_with_index.map { |part, i|
             part.render([*indices, i])
           }.join
-        else
+        elsif main_type.nil? || (main_type == "text" && sub_type == "plain")
           s = body.decoded
-          Mournmail.to_utf8(s, charset).gsub(/\r\n/, "\n")
+          Mournmail.to_utf8(s, charset)
+        else
+          type = Mail::Encodings.decode_encode(self["content-type"].to_s,
+                                               :decode) rescue
+          "broken/type; error=\"#{$!} (#{$!.class})\""
+          "[-1 #{type}]\n"
         end + pgp_signature
       end
 
@@ -42,6 +45,9 @@ module Mournmail
           mail = decrypt(verify: true)
           return mail.dig_part(i, *rest_indices)
         end
+        if i == -1
+          return self
+        end
         part = parts[i]
         if rest_indices.empty?
           part
@@ -76,7 +82,8 @@ module Mournmail
       def render(indices)
         index = indices.join(".")
         type = Mail::Encodings.decode_encode(self["content-type"].to_s,
-                                             :decode)
+                                             :decode) rescue
+          "broken/type; error=\"#{$!} (#{$!.class})\""
         "[#{index} #{type}]\n" + render_content(indices)
       end
 
@@ -113,6 +120,8 @@ module Mournmail
             ""
           end
         end
+      rescue => e
+        "Broken part: #{e} (#{e.class})"
       end
     end
   end

data/lib/mournmail/search_result_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 using Mournmail::MessageRendering
 
 module Mournmail
@@ -21,6 +19,7 @@ module Mournmail
     SEARCH_RESULT_MODE_MAP.define_key(">", :next_page_command)
     SEARCH_RESULT_MODE_MAP.define_key("/", :summary_search_command)
     SEARCH_RESULT_MODE_MAP.define_key("t", :summary_show_thread_command)
+    SEARCH_RESULT_MODE_MAP.define_key("@", :summary_change_account_command)
 
     def initialize(buffer)
       super(buffer)
@@ -32,11 +31,11 @@ module Mournmail
       return if num.nil?
       Mournmail.background do
         message = @buffer[:messages][num]
-        if message.nil?
+        if message.nil? || message._key.nil?
           raise EditorError, "No message found"
         end
         mail = Mail.new(Mournmail.read_mail_cache(message._key))
-        next_tick do
+        foreground do
           show_message(mail)
           @buffer[:message_number] = num
         end

data/lib/mournmail/summary.rb

@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
 require "time"
 require "fileutils"
 require "monitor"
 
 module Mournmail
   class Summary
-    attr_reader :items, :last_uid
+    attr_reader :mailbox, :items, :last_uid
     attr_accessor :uidvalidity
 
     include MonitorMixin
@@ -34,6 +32,10 @@ module Mournmail
       cache_path(mailbox) + ".tmp"
     end
 
+    def self.cache_old_path(mailbox)
+      cache_path(mailbox) + ".old"
+    end
+
     def self.load(mailbox)
       lock_cache(mailbox, :shared) do
         File.open(cache_path(mailbox)) do |f|
@@ -82,12 +84,14 @@ module Mournmail
 
     def add_item(item, message_id, in_reply_to)
       synchronize do
-        parent = @message_id_table[in_reply_to]
-        if parent
-          parent.add_reply(item)
-        else
-          @items.push(item)
-        end
+# Disable threads
+#        parent = @message_id_table[in_reply_to]
+#        if parent
+#          parent.add_reply(item)
+#        else
+#          @items.push(item)
+#        end
+        @items.push(item)
         if message_id
           @message_id_table[message_id] = item
         end
@@ -115,22 +119,28 @@ module Mournmail
       end
     end
 
+    def uids
+      synchronize do
+        @uid_table.keys
+      end
+    end
+
     def read_mail(uid)
       synchronize do
         item = @uid_table[uid]
         if item.cache_id
           File.open(Mournmail.mail_cache_path(item.cache_id)) do |f|
-            [Mail.new(f.read), false]
+            [Mournmail.parse_mail(f.read), false]
           end
         else
           Mournmail.imap_connect do |imap|
             imap.select(@mailbox)
             data = imap.uid_fetch(uid, "BODY[]")
-            if data.empty?
+            if data.nil? || data.empty?
               raise EditorError, "No such mail: #{uid}"
             end
             s = data[0].attr["BODY[]"]
-            mail = Mail.new(s)
+            mail = Mournmail.parse_mail(s)
             if @mailbox != Mournmail.account_config[:spam_mailbox]
               item.cache_id = Mournmail.write_mail_cache(s)
               Mournmail.index_mail(item.cache_id, mail)
@@ -148,9 +158,14 @@ module Mournmail
         Summary.lock_cache(@mailbox, :exclusive) do
           cache_path = Summary.cache_path(@mailbox)
           tmp_path = Summary.cache_tmp_path(@mailbox)
+          old_path = Summary.cache_old_path(@mailbox)
           File.open(tmp_path, "w", 0600) do |f|
             Marshal.dump(self, f)
           end
+          begin
+            File.rename(cache_path, old_path)
+          rescue Errno::ENOENT
+          end
           File.rename(tmp_path, cache_path)
         end
       end
@@ -158,7 +173,7 @@ module Mournmail
 
     def to_s
       synchronize do
-        items.each_with_object(String.new) do |item, s|
+        items.each_with_object(+"") do |item, s|
           s << item.to_s
         end
       end
@@ -232,7 +247,7 @@ module Mournmail
 
     def format_line(limit = 78, from_limit = 16, level = 0)
       space = "  " * (level < 8 ? level : 8)
-      s = String.new
+      s = +""
       s << format("%6d %s%s %s[ %s ] ",
                   @uid, format_flags(@flags), format_date(@date), space,
                   ljust(format_from(@from), from_limit))
@@ -243,7 +258,7 @@ module Mournmail
     
     def ljust(s, n)
       width = 0
-      str = String.new
+      str = +""
       s.each_char do |c|
         w = Buffer.display_width(c)
         width += w
@@ -258,14 +273,14 @@ module Mournmail
     end
 
     def format_flags(flags)
-      if flags.include?(:Deleted)
+      if !flags.include?(:Seen)
+        "u"
+      elsif flags.include?(:Deleted)
         "d"
       elsif flags.include?(:Flagged)
         "$"
       elsif flags.include?(:Answered)
         "a"
-      elsif !flags.include?(:Seen)
-        "u"
       else
         " "
       end

data/lib/mournmail/summary_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 using Mournmail::MessageRendering
 
 module Mournmail
@@ -56,9 +54,9 @@ module Mournmail
       summary = Mournmail.current_summary
       Mournmail.background do
         mail, fetched = summary.read_mail(uid)
-        next_tick do
+        foreground do
           show_message(mail)
-          mark_as_seen(uid, !fetched)
+          mark_as_seen(uid, false)
           Mournmail.current_uid = uid
           Mournmail.current_mail = mail
         end
@@ -101,7 +99,7 @@ module Mournmail
       Mournmail.background do
         mail = read_current_mail[0]
         body = mail.render_body
-        next_tick do
+        foreground do
           Window.current = Mournmail.message_window
           Commands.mail(run_hooks: false)
           if reply_all
@@ -243,7 +241,7 @@ module Mournmail
         end
         summary_text = summary.to_s
         summary.save
-        next_tick do
+        foreground do
           buffer.read_only_edit do
             buffer.clear
             buffer.insert(summary_text)
@@ -258,7 +256,7 @@ module Mournmail
       uid = selected_uid
       Mournmail.background do
         mail, = read_current_mail
-        next_tick do
+        foreground do
           source_buffer = Buffer.find_or_new("*message-source*",
                                              file_encoding: "ascii-8bit",
                                              undo_limit: 0, read_only: true)
@@ -305,7 +303,7 @@ module Mournmail
         end
         s = mails.map { |mail| mail.body.decoded }.join
         mail = Mail.new(s)
-        next_tick do
+        foreground do
           show_message(mail)
           Mournmail.current_uid = nil
           Mournmail.current_mail = mail
@@ -363,7 +361,7 @@ module Mournmail
       Mournmail.background do
         Mournmail.imap_connect do |imap|
           unless imap.list("", mailbox)
-            if next_tick! { yes_or_no?("#{mailbox} doesn't exist; Create?") }
+            if foreground! { yes_or_no?("#{mailbox} doesn't exist; Create?") }
               imap.create(mailbox)
             else
               next
@@ -391,7 +389,7 @@ module Mournmail
           begin
             target_uids.each_slice(20) do |uids|
               data = imap.uid_fetch(uids, "BODY[]")
-              data.each do |i|
+              data&.each do |i|
                 uid = i.attr["UID"]
                 s = i.attr["BODY[]"]
                 if s
@@ -404,7 +402,7 @@ module Mournmail
               end
               count += uids.size
               progress = (count.to_f * 100 / target_uids.size).round
-              next_tick do
+              foreground do
                 message("Prefetching mails... #{progress}%", log: false)
               end
             end
@@ -412,7 +410,7 @@ module Mournmail
             summary.save
           end
         end
-        next_tick do
+        foreground do
           message("Done")
         end
       end
@@ -428,7 +426,7 @@ module Mournmail
             match_record.subject | match_record.body
           }
         }.paginate([["date", :desc]], page: page, size: 100)
-        next_tick do
+        foreground do
           show_search_result(messages, query: query)
           message("Searched (#{messages.current_page}/#{messages.n_pages})")
         end
@@ -442,7 +440,7 @@ module Mournmail
         messages = Groonga["Messages"].select { |m|
           m.thread_id == message.thread_id
         }.sort([["date", :asc]])
-        next_tick do
+        foreground do
           show_search_result(messages, buffer_name: "*thread*")
           i = messages.find_index { |m| m._key == message._key }
           Buffer.current.goto_line(i + 1)
@@ -453,6 +451,12 @@ module Mournmail
     define_local_command(:summary_change_account,
                          doc: "Change the current account.") do
       |account = read_account_name("Change account: ")|
+      unless CONFIG[:mournmail_accounts].key?(account)
+        raise EditorError, "No such account: #{account}"
+      end
+      if Mournmail.background_thread
+        raise EditorError, "Background thread is running"
+      end
       mournmail_quit
       Mournmail.current_account = account
       mournmail
@@ -534,7 +538,7 @@ module Mournmail
         Mournmail.background do
           summary_item.toggle_flag(flag)
           Mournmail.current_summary.save
-          next_tick do
+          foreground do
             update_flags(summary_item)
           end
         end
@@ -596,7 +600,7 @@ module Mournmail
 
     def ljust(s, n)
       width = 0
-      str = String.new
+      str = +""
       s.gsub(/\t/, " ").each_char do |c|
         w = Buffer.display_width(c)
         width += w
@@ -619,7 +623,7 @@ module Mournmail
         imap.uid_store(uid_set, "+FLAGS", [:Deleted])
         count += uid_set.size
         progress = (count.to_f * 100 / uids.size).round
-        next_tick do
+        foreground do
           if dst_mailbox
             message("Refiling mails to #{dst_mailbox}... #{progress}%",
                     log: false)
@@ -628,7 +632,7 @@ module Mournmail
           end 
         end
       end
-      next_tick do
+      foreground do
         if dst_mailbox
           message("Refiled mails to #{dst_mailbox}")
         else
@@ -660,7 +664,7 @@ module Mournmail
       end
       summary_text = summary.to_s
       summary.save
-      next_tick do
+      foreground do
         @buffer.read_only_edit do
           @buffer.clear
           @buffer.insert(summary_text)

data/lib/mournmail/utils.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "mail"
 require "net/imap"
 require "time"
@@ -7,7 +5,38 @@ require "tempfile"
 require "fileutils"
 require "timeout"
 require "digest"
+require "nkf"
 require "groonga"
+require 'google/api_client/client_secrets'
+require 'google/api_client/auth/storage'
+require 'google/api_client/auth/storages/file_store'
+require 'launchy'
+
+class Net::SMTP
+  def auth_xoauth2(user, secret)
+    check_auth_args user, secret
+    res = critical {
+      s = Mournmail.xoauth2_string(user, secret)
+      get_response('AUTH XOAUTH2 ' + base64_encode(s))
+    }
+    check_auth_response res
+    res
+  end
+end
+
+class Net::IMAP::Xoauth2Authenticator
+  def process(data)
+    Mournmail.xoauth2_string(@user, @access_token)
+  end
+
+  private
+
+  def initialize(user, access_token)
+    @user = user
+    @access_token = access_token
+  end
+end
+Net::IMAP.add_authenticator("XOAUTH2", Net::IMAP::Xoauth2Authenticator)
 
 module Mournmail
   begin
@@ -148,12 +177,17 @@ module Mournmail
       end
       if @imap.nil? || @imap.disconnected?
         conf = account_config
+        auth_type = conf[:imap_options][:auth_type] || "PLAIN"
+        password = conf[:imap_options][:password]
+        if auth_type == "gmail"
+          auth_type = "XOAUTH2"
+          password = google_access_token
+        end
         Timeout.timeout(CONFIG[:mournmail_imap_connect_timeout]) do
           @imap = Net::IMAP.new(conf[:imap_host],
                                 conf[:imap_options])
-          @imap.authenticate(conf[:imap_options][:auth_type] || "PLAIN",
-                             conf[:imap_options][:user_name],
-                             conf[:imap_options][:password])
+          @imap.authenticate(auth_type, conf[:imap_options][:user_name],
+                             password)
           @mailboxes = @imap.list("", "*").map { |mbox|
             Net::IMAP.decode_utf7(mbox.name)
           }
@@ -179,40 +213,113 @@ module Mournmail
     end
   end
 
+  def self.google_access_token
+    auth_path = File.expand_path("cache/#{current_account}/google_auth.json",
+                                 CONFIG[:mournmail_directory])
+    FileUtils.mkdir_p(File.dirname(auth_path))
+    store = Google::APIClient::FileStore.new(auth_path)
+    storage = Google::APIClient::Storage.new(store)
+    storage.authorize
+    if storage.authorization.nil?
+      path = File.expand_path(account_config[:client_secret_path])
+      client_secrets = Google::APIClient::ClientSecrets.load(path)
+      auth_client = client_secrets.to_authorization
+      auth_client.update!(
+        :scope => 'https://mail.google.com/',
+        :redirect_uri => 'urn:ietf:wg:oauth:2.0:oob'
+      )
+
+      auth_uri = auth_client.authorization_uri.to_s
+      Launchy.open(auth_uri)
+
+      auth_client.code = foreground! {
+        Window.echo_area.clear_message
+        Window.redisplay
+        read_from_minibuffer("Code: ").chomp
+      }
+      auth_client.fetch_access_token!
+      old_umask = File.umask(077)
+      begin
+        storage.write_credentials(auth_client)
+      ensure
+        File.umask(old_umask)
+      end
+    else
+      auth_client = storage.authorization
+    end
+    auth_client.access_token
+  end
+  
+  def self.xoauth2_string(user, access_token)
+    "user=#{user}\1auth=Bearer #{access_token}\1\1"
+  end
+
   def self.fetch_summary(mailbox, all: false)
+    if all
+      summary = Mournmail::Summary.new(mailbox)
+    else
+      summary = Mournmail::Summary.load_or_new(mailbox)
+    end
     imap_connect do |imap|
       imap.select(mailbox)
-      if all
-        summary = Mournmail::Summary.new(mailbox)
-      else
-        summary = Mournmail::Summary.load_or_new(mailbox)
-      end
       uidvalidity = imap.responses["UIDVALIDITY"].last
-      if summary.uidvalidity.nil?
-        summary.uidvalidity = uidvalidity
-      elsif uidvalidity && uidvalidity != summary.uidvalidity
-        clear = next_tick {
+      if uidvalidity && summary.uidvalidity &&
+          uidvalidity != summary.uidvalidity
+        clear = foreground! {
           yes_or_no?("UIDVALIDITY has been changed; Clear cache?")
         }
         if clear
           summary = Mournmail::Summary.new(mailbox)
         end
       end
-      first_uid = (summary.last_uid || 0) + 1
-      data = imap.uid_fetch(first_uid..-1, ["UID", "ENVELOPE", "FLAGS"])
+      summary.uidvalidity = uidvalidity
+      uids = imap.uid_search("ALL")
+      new_uids = uids - summary.uids
+      return summary if new_uids.empty?
       summary.synchronize do
-        data&.each do |i|
-          uid = i.attr["UID"]
-          next if summary[uid]
-          env = i.attr["ENVELOPE"]
-          flags = i.attr["FLAGS"]
-          item = Mournmail::SummaryItem.new(uid, env.date, env.from,
-                                            env.subject, flags)
-          summary.add_item(item, env.message_id, env.in_reply_to)
+        new_uids.each_slice(1000) do |uid_chunk|
+          data = imap.uid_fetch(uid_chunk, ["UID", "ENVELOPE", "FLAGS"])
+          data&.each do |i|
+            uid = i.attr["UID"]
+            next if summary[uid]
+            env = i.attr["ENVELOPE"]
+            flags = i.attr["FLAGS"]
+            item = Mournmail::SummaryItem.new(uid, env.date, env.from,
+                                              env.subject, flags)
+            summary.add_item(item, env.message_id, env.in_reply_to)
+          end
         end
       end
       summary
     end
+  rescue SocketError, Timeout::Error => e
+    foreground do
+      message(e.message)
+    end
+    summary
+  end
+
+  def self.show_summary(summary)
+    buffer = Buffer.find_or_new("*summary*", undo_limit: 0,
+                                read_only: true)
+    buffer.apply_mode(Mournmail::SummaryMode)
+    buffer.read_only_edit do
+      buffer.clear
+      buffer.insert(summary.to_s)
+    end
+    switch_to_buffer(buffer)
+    Mournmail.current_mailbox = summary.mailbox
+    Mournmail.current_summary = summary
+    Mournmail.current_mail = nil
+    Mournmail.current_uid = nil
+    begin
+      buffer.beginning_of_buffer
+      buffer.re_search_forward(/^ *\d+ u/)
+    rescue SearchError
+      buffer.end_of_buffer
+      buffer.re_search_backward(/^ *\d+ /, raise_error: false)
+    end
+    summary_read_command
   end
 
   def self.mailbox_cache_path(mailbox)
@@ -277,6 +384,8 @@ module Mournmail
       references = Array(mail.references) | Array(mail.in_reply_to)
       if references.empty?
         mail.message_id
+      elsif /\Aredmine\.issue-/.match?(references.first)
+        references.first
       else
         parent = messages_db.select { |m|
           references.inject(nil) { |cond, ref|
@@ -343,17 +452,17 @@ module Mournmail
   end
 
   def self.force_utf8(s)
-    s.force_encoding(Encoding::UTF_8).scrub("?")
+    s.dup.force_encoding(Encoding::UTF_8).scrub("?")
   end
 
   def self.to_utf8(s, charset)
-    if /\Autf-8\z/i =~ charset
+    if /\Autf-8\z/i.match?(charset)
       force_utf8(s)
     else
       begin
         s.encode(Encoding::UTF_8, charset, replace: "?")
-      rescue Encoding::ConverterNotFoundError
-        force_utf8(s)
+      rescue
+        force_utf8(NKF.nkf("-w", s))
       end
     end.gsub(/\r\n/, "\n")
   end
@@ -404,4 +513,8 @@ module Mournmail
       @groonga_db.close
     end
   end
+
+  def self.parse_mail(s)
+    Mail.new(s.scrub("??"))
+  end
 end

data/lib/mournmail/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Mournmail
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/textbringer_plugin.rb

@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 require_relative "mournmail"

data/mournmail.gemspec

@@ -23,8 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "textbringer"
   spec.add_runtime_dependency "mail"
+  spec.add_runtime_dependency "mime-types"
   spec.add_runtime_dependency "rroonga"
+  spec.add_runtime_dependency "google-api-client"
+  spec.add_runtime_dependency "launchy"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", "~> 12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rroonga
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +66,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 description: A message user agent for Textbringer.
 email:
 - shugo@ruby-lang.org
@@ -128,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: A message user agent for Textbringer.