mournmail 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cea609c299af267b279b8434b661ec471776fe26c5175fdc363a527cc3cc7e
-  data.tar.gz: b77b32b8fb3923a8e545cd1cd5084dab346974a4f9aa210ae353f76e17839370
+  metadata.gz: 8cbf82ccf54ab48f7596d24aaacb4673ca8f8271f304264df7aa96a932dac2fb
+  data.tar.gz: facbe695e21c68a1b5c50a9bb9d50894f948e09bab2a436b2174656953b809bf
 SHA512:
-  metadata.gz: a891f54dc0e39e09d72a5a8eb9e0272560226fe417eb809462f245bf77e535a9dcaacdf34600e45933723dd0b81378d64e73f1538dcb8c5f2e7c4ffea370078a
-  data.tar.gz: f0bee693b1b02a51449e38ca5d001a085f999040be22dcb5d29e1782dffd3dd31698312b9abde9f1fbc57528a72e031df05fa75ed4a6ee2c7535cd318063991e
+  metadata.gz: 49c6ba544f435ea5eb150b510e26d18ab0bcd0fddd1a1a147dc0aee84bde05656bb153f44628ee0828b2e02c8f6ccc27b75c7e61b34ca0511c0eb2f074240e1e
+  data.tar.gz: 43accf4207ec48914c79940d2c45ce931beab826759b3e64174257891bf70d741913800aa976b41c19a2b47d1a0c8e32a00215995889058fdee5c82b4bc6e5e0

data/README.md

@@ -33,7 +33,11 @@ CONFIG[:mournmail_accounts] = {
     },
     spam_mailbox: "spam",
     outbox_mailbox: "outbox",
-    archive_mailbox_format: "archive/%Y"
+    archive_mailbox_format: "archive/%Y",
+    signature: <<~EOF
+      -- 
+      Shugo Maeda <shugo@example.com>
+    EOF
   },
   "gmail.com" => {
     from: "Example <example@gmail.com>",
@@ -54,7 +58,7 @@ CONFIG[:mournmail_accounts] = {
       password: File.read(File.expand_path("~/.textbringer/gmail_passwd")).chomp,
       ssl: true
     },
-    spam_mailbox: "迷惑メール",
+    spam_mailbox: "[Gmail]/迷惑メール",
     archive_mailbox_format: false
   },
 }

data/lib/mournmail/commands.rb

@@ -11,6 +11,14 @@ define_command(:mournmail_visit_mailbox, doc: "Visit mailbox") do
   end
 end
 
+define_command(:mournmail_visit_spam_mailbox, doc: "Visit spam mailbox") do
+  mailbox = Mournmail.account_config[:spam_mailbox]
+  if mailbox.nil?
+    raise EditorError, "spam_mailbox is not specified"
+  end
+  mournmail_visit_mailbox(Net::IMAP.encode_utf7(mailbox))
+end
+
 define_command(:mournmail_summary_sync, doc: "Sync summary.") do
   |mailbox = (Mournmail.current_mailbox || "INBOX"),
     all = current_prefix_arg|
@@ -61,9 +69,10 @@ define_command(:mail, doc: "Write a new mail.") do
     User-Agent: Mournmail/#{Mournmail::VERSION} Textbringer/#{Textbringer::VERSION} Ruby/#{RUBY_VERSION}
     --text follows this line--
   EOF
-  re_search_backward(/^To:/)
-  end_of_line
+  beginning_of_buffer
+  re_search_forward(/^To: */)
   if run_hooks
+    Mournmail.insert_signature
     run_hooks(:mournmail_draft_setup_hook)
   end
 end

data/lib/mournmail/config.rb

@@ -14,6 +14,13 @@ module Textbringer
     "X-Mailer",
     "Content-Type"
   ]
+  CONFIG[:mournmail_quote_header_fields] = [
+    "Subject",
+    "Date",
+    "From",
+    "To",
+    "Cc"
+  ]
   CONFIG[:mournmail_imap_connect_timeout] = 10
   CONFIG[:mournmail_keep_alive_interval] = 60
   case RUBY_PLATFORM
@@ -28,4 +35,5 @@ module Textbringer
     CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
   end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
+  CONFIG[:mournmail_signature_regexp] = /^\n-- /
 end

data/lib/mournmail/draft_mode.rb

@@ -8,6 +8,7 @@ module Mournmail
     MAIL_MODE_MAP.define_key("\C-c\C-xv", :draft_pgp_sign_command)
     MAIL_MODE_MAP.define_key("\C-c\C-xe", :draft_pgp_encrypt_command)
     MAIL_MODE_MAP.define_key("\C-c\t", :insert_signature_command)
+    MAIL_MODE_MAP.define_key("\C-c@", :draft_change_account_command)
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
@@ -68,12 +69,15 @@ module Mournmail
                    content: File.read(file),
                    encoding: "binary")
       end
-      conf = Mournmail.account_config
+      account = @buffer[:mournmail_delivery_account] ||
+        Mournmail.current_account
+      conf = CONFIG[:mournmail_accounts][account]
       options = @buffer[:mournmail_delivery_options] ||
         conf[:delivery_options]
       if options[:authentication] == "gmail"
+        token = Mournmail.google_access_token(account)
         options = options.merge(authentication: "xoauth2",
-                                password: Mournmail.google_access_token)
+                                password: token)
       end
       m.delivery_method(@buffer[:mournmail_delivery_method] ||
                         conf[:delivery_method],
@@ -186,6 +190,23 @@ module Mournmail
       @buffer.insert(CONFIG[:signature])
     end
 
+    define_local_command(:draft_change_account, doc: "Change account.") do
+      |account = Mournmail.read_account_name("Change account: ")|
+      from = CONFIG[:mournmail_accounts][account][:from]
+      @buffer[:mournmail_delivery_account] = account
+      @buffer.save_excursion do
+        @buffer.beginning_of_buffer
+        @buffer.re_search_forward(/^From:.*/)
+        @buffer.replace_match("From: " + from)
+        @buffer.end_of_buffer
+        if @buffer.re_search_backward(CONFIG[:mournmail_signature_regexp],
+                                      raise_error: false)
+          @buffer.delete_region(@buffer.point, @buffer.point_max)
+        end
+        Mournmail.insert_signature
+      end
+    end
+
     private
 
     def end_of_header

data/lib/mournmail/message_mode.rb

@@ -12,7 +12,7 @@ module Mournmail
 
     # See http://nihongo.jp/support/mail_guide/dev_guide.txt
     MAILTO_REGEXP = URI.regexp("mailto")
-    URI_REGEXP = /(https?|ftp):\/\/[^ 　\t\n>)"]*[^] 　\t\n>.,:)"]+|#{MAILTO_REGEXP}/
+    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}/
 
@@ -24,6 +24,7 @@ module Mournmail
     def initialize(buffer)
       super(buffer)
       buffer.keymap = MESSAGE_MODE_MAP
+      @attached_file = nil
     end
 
     define_local_command(:message_open_link_or_part,
@@ -52,6 +53,9 @@ module Mournmail
 
     define_local_command(:message_next_link_or_part,
                          doc: "Go to the next link or MIME part.") do
+      if @buffer.looking_at?(URI_OR_MIME_REGEXP)
+        @buffer.forward_char
+      end
       if @buffer.re_search_forward(URI_OR_MIME_REGEXP, raise_error: false)
         goto_char(@buffer.match_beginning(0))
       else
@@ -76,8 +80,8 @@ module Mournmail
 
     def part_file_name(part)
       file_name =
-        part["content-disposition"]&.parameters&.[]("filename") ||
-        part["content-type"]&.parameters&.[]("name") ||
+        (part["content-disposition"]&.parameters&.[]("filename") rescue nil) ||
+        (part["content-type"]&.parameters&.[]("name") rescue nil) ||
         part_default_file_name(part)
       decoded_file_name = Mail::Encodings.decode_encode(file_name, :decode)
       if /\A([A-Za-z0-9_\-]+)'(?:[A-Za-z0-9_\-])*'(.*)/ =~ decoded_file_name
@@ -130,18 +134,20 @@ module Mournmail
       else
         file_name = "mournmail"
       end
-      f = Tempfile.open(file_name, binmode: true)
+      @attached_file = Tempfile.open(file_name, binmode: true)
       s = part.decoded
-      if part.charset
+      if part.content_type == "text/html"
+        s = s.sub(/<meta http-equiv="content-type".*?>/i, "")
+      elsif part.charset
         s = s.encode(part.charset)
       end
-      f.write(s)
-      f.close
-      if ext == "txt"
-        find_file(f.path)
+      @attached_file.write(s)
+      @attached_file.close
+      if part.main_type == "text" && part.sub_type != "html"
+        find_file(@attached_file.path)
       else
         background do
-          system(*CONFIG[:mournmail_file_open_comamnd], f.path,
+          system(*CONFIG[:mournmail_file_open_comamnd], @attached_file.path,
                  out: File::NULL, err: File::NULL)
         end
       end

data/lib/mournmail/message_rendering.rb

@@ -8,8 +8,8 @@ module Mournmail
         render_header + "\n" + render_body(indices)
       end
 
-      def render_header
-        CONFIG[:mournmail_display_header_fields].map { |name|
+      def render_header(fields = CONFIG[:mournmail_display_header_fields])
+        fields.map { |name|
           val = self[name]&.to_s&.gsub(/\t/, " ")
           val ? "#{name}: #{val}\n" : ""
         }.join
@@ -41,11 +41,36 @@ module Mournmail
         else
           type = Mail::Encodings.decode_encode(self["content-type"].to_s,
                                                :decode) rescue
-          "broken/type; error=\"#{$!} (#{$!.class})\""
+            "broken/type; error=\"#{$!} (#{$!.class})\""
           "[0 #{type}]\n"
         end + pgp_signature
       end
 
+      def render_text(indices = [])
+        if HAVE_MAIL_GPG && encrypted?
+          mail = decrypt(verify: true)
+          return mail.render_text(indices)
+        end
+        if multipart?
+          parts.each_with_index.map { |part, i|
+            if sub_type == "alternative" && i > 0
+              ""
+            else
+              part.render_text([*indices, i])
+            end
+          }.join("\n")
+        elsif main_type.nil? || main_type == "text"
+          s = Mournmail.to_utf8(body.decoded, charset)
+          if sub_type == "html"
+            Html2Text.convert(s)
+          else
+            s
+          end
+        else
+          ""
+        end
+      end
+
       def dig_part(i, *rest_indices)
         if HAVE_MAIL_GPG && encrypted?
           mail = decrypt(verify: true)
@@ -91,7 +116,39 @@ module Mournmail
                                              :decode) rescue
           "broken/type; error=\"#{$!} (#{$!.class})\""
         "[#{index} #{type}]\n" +
-          (no_content ? "" : render_content(indices))
+          render_content(indices, no_content)
+      end
+
+      def render_text(indices)
+        if multipart?
+          parts.each_with_index.map { |part, i|
+            if sub_type == "alternative" && i > 0
+              ""
+            else
+              part.render_text([*indices, i])
+            end
+          }.join("\n")
+        else
+          if main_type == "message" && sub_type == "rfc822"
+            mail = Mail.new(body.raw_source)
+            mail.render_header(CONFIG[:mournmail_quote_header_fields]) +
+              "\n" + mail.render_text(indices)
+          elsif attachment?
+            ""
+          else
+            if main_type == "text"
+              if sub_type == "html"
+                Html2Text.convert(decoded).sub(/(?<!\n)\z/, "\n")
+              else
+                decoded.sub(/(?<!\n)\z/, "\n").gsub(/\r\n/, "\n")
+              end
+            else
+              ""
+            end
+          end
+        end
+      rescue => e
+        ""
       end
 
       def dig_part(i, *rest_indices)
@@ -110,26 +167,29 @@ module Mournmail
 
       private
 
-      def render_content(indices)
+      def render_content(indices, no_content)
         if multipart?
           parts.each_with_index.map { |part, i|
-            no_content = sub_type == "alternative" && i > 0
-            part.render([*indices, i], no_content)
+            part.render([*indices, i],
+                        no_content || sub_type == "alternative" && i > 0)
           }.join
-        elsif main_type == "message" && sub_type == "rfc822"
-          mail = Mail.new(body.raw_source)
-          mail.render(indices)
-        elsif attachment?
-          ""
         else
-          if main_type == "text"
-            if sub_type == "html"
-              Html2Text.convert(decoded).sub(/(?<!\n)\z/, "\n")
+          return "" if no_content
+          if main_type == "message" && sub_type == "rfc822"
+            mail = Mail.new(body.raw_source)
+            mail.render(indices)
+          elsif attachment?
+            ""
+          else
+            if main_type == "text"
+              if sub_type == "html"
+                Html2Text.convert(decoded).sub(/(?<!\n)\z/, "\n")
+              else
+                decoded.sub(/(?<!\n)\z/, "\n").gsub(/\r\n/, "\n")
+              end
             else
-              decoded.sub(/(?<!\n)\z/, "\n").gsub(/\r\n/, "\n")
+              ""
             end
-          else
-            ""
           end
         end
       rescue => e

data/lib/mournmail/summary.rb

@@ -141,7 +141,8 @@ module Mournmail
             end
             s = data[0].attr["BODY[]"]
             mail = Mournmail.parse_mail(s)
-            if @mailbox != Mournmail.account_config[:spam_mailbox]
+            spam_mailbox = Mournmail.account_config[:spam_mailbox]
+            if @mailbox != Net::IMAP.encode_utf7(spam_mailbox)
               item.cache_id = Mournmail.write_mail_cache(s)
               Mournmail.index_mail(item.cache_id, mail)
             end

data/lib/mournmail/summary_mode.rb

@@ -25,6 +25,7 @@ module Mournmail
     SUMMARY_MODE_MAP.define_key("*t", :summary_mark_unflagged_command)
     SUMMARY_MODE_MAP.define_key("y", :summary_archive_command)
     SUMMARY_MODE_MAP.define_key("o", :summary_refile_command)
+    SUMMARY_MODE_MAP.define_key("!", :summary_refile_spam_command)
     SUMMARY_MODE_MAP.define_key("p", :summary_prefetch_command)
     SUMMARY_MODE_MAP.define_key("X", :summary_expunge_command)
     SUMMARY_MODE_MAP.define_key("v", :summary_view_source_command)
@@ -33,6 +34,7 @@ module Mournmail
     SUMMARY_MODE_MAP.define_key("k", :previous_line)
     SUMMARY_MODE_MAP.define_key("j", :next_line)
     SUMMARY_MODE_MAP.define_key("m", :mournmail_visit_mailbox)
+    SUMMARY_MODE_MAP.define_key("S", :mournmail_visit_spam_mailbox)
     SUMMARY_MODE_MAP.define_key("/", :summary_search_command)
     SUMMARY_MODE_MAP.define_key("t", :summary_show_thread_command)
     SUMMARY_MODE_MAP.define_key("@", :summary_change_account_command)
@@ -98,7 +100,7 @@ module Mournmail
       |reply_all = current_prefix_arg|
       Mournmail.background do
         mail = read_current_mail[0]
-        body = mail.render_body
+        body = mail.render_text
         foreground do
           Window.current = Mournmail.message_window
           Commands.mail(run_hooks: false)
@@ -137,6 +139,7 @@ module Mournmail
         On #{mail['date']}
         #{mail['from']} wrote:
       EOF
+          Mournmail.insert_signature
           exchange_point_and_mark
           run_hooks(:mournmail_draft_setup_hook)
         end
@@ -373,10 +376,23 @@ module Mournmail
       end
     end
 
+    define_local_command(:summary_refile_spam,
+                         doc: "Refile marked mails as spam.") do
+      mailbox = Mournmail.account_config[:spam_mailbox]
+      if mailbox.nil?
+        raise EditorError, "spam_mailbox is not specified"
+      end
+      summary_refile(Net::IMAP.encode_utf7(mailbox))
+    end
+
     define_local_command(:summary_prefetch,
                          doc: "Prefetch mails.") do
       summary = Mournmail.current_summary
       mailbox = Mournmail.current_mailbox
+      spam_mailbox = Mournmail.account_config[:spam_mailbox]
+      if mailbox == Net::IMAP.encode_utf7(spam_mailbox)
+        raise EditorError, "Can't prefetch spam"
+      end
       target_uids = @buffer.to_s.scan(/^ *\d+/).map { |s|
         s.to_i
       }.select { |uid|
@@ -394,9 +410,7 @@ module Mournmail
                 s = i.attr["BODY[]"]
                 if s
                   cache_id = Mournmail.write_mail_cache(s)
-                  if mailbox != Mournmail.account_config[:spam_mailbox]
-                    Mournmail.index_mail(cache_id, Mail.new(s))
-                  end
+                  Mournmail.index_mail(cache_id, Mail.new(s))
                   summary[uid].cache_id = cache_id
                 end
               end
@@ -450,7 +464,7 @@ module Mournmail
 
     define_local_command(:summary_change_account,
                          doc: "Change the current account.") do
-      |account = read_account_name("Change account: ")|
+      |account = Mournmail.read_account_name("Change account: ")|
       unless CONFIG[:mournmail_accounts].key?(account)
         raise EditorError, "No such account: #{account}"
       end
@@ -651,13 +665,6 @@ module Mournmail
       message
     end
 
-    def read_account_name(prompt, **opts)
-      f = ->(s) {
-        complete_for_minibuffer(s, CONFIG[:mournmail_accounts].keys)
-      }
-      read_from_minibuffer(prompt, completion_proc: f, **opts)
-    end
-
     def delete_from_summary(summary, uids, msg)
       summary.delete_item_if do |item|
         uids.include?(item.uid)

data/lib/mournmail/utils.rb

@@ -225,15 +225,16 @@ module Mournmail
     end
   end
 
-  def self.google_access_token
-    auth_path = File.expand_path("cache/#{current_account}/google_auth.json",
+  def self.google_access_token(account = current_account)
+    auth_path = File.expand_path("cache/#{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])
+      conf = CONFIG[:mournmail_accounts][account]
+      path = File.expand_path(conf[:client_secret_path])
       client_secrets = Google::APIClient::ClientSecrets.load(path)
       auth_client = client_secrets.to_authorization
       auth_client.update!(
@@ -382,7 +383,8 @@ module Mournmail
     dir = File.dirname(path)
     base = File.basename(path)
     begin
-      f = Tempfile.create(["#{base}-", ".tmp"], dir)
+      f = Tempfile.create(["#{base}-", ".tmp"], dir,
+                          external_encoding: "ASCII-8BIT", binmode: true)
       begin
         f.write(s)
       ensure
@@ -554,4 +556,24 @@ module Mournmail
   def self.parse_mail(s)
     Mail.new(s.scrub("??"))
   end
+
+  def self.read_account_name(prompt, **opts)
+    f = ->(s) {
+      complete_for_minibuffer(s, CONFIG[:mournmail_accounts].keys)
+    }
+    read_from_minibuffer(prompt, completion_proc: f, **opts)
+  end
+
+  def self.insert_signature
+    account = Buffer.current[:mournmail_delivery_account] ||
+      Mournmail.current_account
+    signature = CONFIG[:mournmail_accounts][account][:signature]
+    if signature
+      Buffer.current.save_excursion do
+        end_of_buffer
+        insert("\n")
+        insert(signature)
+      end
+    end
+  end
 end

data/lib/mournmail/version.rb

@@ -1,3 +1,3 @@
 module Mournmail
-  VERSION = "0.3.2"
+  VERSION = "1.0.0"
 end

data/mournmail.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "html2text"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 12.0"
+  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.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -126,14 +126,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 description: A message user agent for Textbringer.