mournmail 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce6a83b1d41699944c7440f0737318437931a7e
-  data.tar.gz: 592a006b174161b564ce302739e19382ef07fda9
+  metadata.gz: 624dd4f9dacde981ede7170c87da6c8ddb3a6aae
+  data.tar.gz: 9b1890ed2a07cdd551e4688bb88d7a80b1ff2c51
 SHA512:
-  metadata.gz: bda483a4723883895517a781308ee8305fc60bc5fab09e6c8ef3181ab770d04304a7f72ccc0b85f23cfa198ae1574ba5ec80c6c9fa961c7a7c17e1da31dc0dd0
-  data.tar.gz: 79f6879cc3b2737855a3dac77768bda6b440a0303400daa7c8085ae4fb0639c440e6ec0246cfcfc8f4bbefecf8dab6657c57291120e162ee3700f8d88262d939
+  metadata.gz: ea1353b03b02800c953d1df9c088400ec1d5698953105f9a0b8c55f1b387d61367061e83f873a891bfbcd73c3bf7a6f17e5a0b539d1cbe16b052b104cb88b18e
+  data.tar.gz: 97a308e32677cc6a51490d1be5f4528159760e22866ceef39d33f977ee94fadd3fd95369ab72199baf8d0f5a47cb9daad435b5d0d971e20b2013a82bcc41e2f5

data/lib/mournmail/draft_mode.rb

@@ -65,7 +65,7 @@ module Mournmail
           if !attached_messages.empty?
             attached_messages.each do |attached_message|
               mailbox, uid = attached_message.strip.split("/")
-              s = Mournmail.read_mail(mailbox, uid.to_i)
+              s, = Mournmail.read_mail(mailbox, uid.to_i)
               part = Mail::Part.new(content_type: "message/rfc822", body: s)
               m.body << part
             end

data/lib/mournmail/summary.rb

@@ -11,8 +11,7 @@ module Mournmail
     include MonitorMixin
 
     def self.cache_path(mailbox)
-      File.expand_path("cache/#{mailbox}/.summary",
-                       CONFIG[:mournmail_directory])
+      File.join(Mournmail.mailbox_cache_path(mailbox), ".summary")
     end
 
     def self.load(mailbox)
@@ -179,7 +178,7 @@ module Mournmail
     def format_line(limit = 78, from_limit = 16, level = 0)
       space = "  " * (level < 8 ? level : 8)
       s = String.new
-      s << format("%s %s%s %s[ %s ] ",
+      s << format("%6d %s%s %s[ %s ] ",
                   @uid, format_flags(@flags), format_date(@date), space,
                   ljust(format_from(@from), from_limit))
       s << ljust(decode_eword(@subject.to_s), limit - Buffer.display_width(s))
@@ -242,20 +241,28 @@ module Mournmail
     def update_flag(sign, flag, update_server: true)
       if update_server
         Mournmail.imap_connect do |imap|
-          data = imap.uid_store(@uid, "#{sign}FLAGS", [flag]).first
-          @flags = data.attr["FLAGS"]
+          data = imap.uid_store(@uid, "#{sign}FLAGS", [flag])&.first
+          if data
+            @flags = data.attr["FLAGS"]
+          else
+            update_flag_local(sign, flag)
+          end
         end
       else
-        case
-        when "+"
-          @flags.push(flag)
-        when "-"
-          @flags.delete(flag)
-        end
+        update_flag_local(sign, flag)
       end
       if @line
-        s = format("%s %s", @uid, format_flags(@flags))
-        @line.sub!(/^\d+ ./, s)
+        s = format("%6d %s", @uid, format_flags(@flags))
+        @line.sub!(/^ *\d+ ./, s)
+      end
+    end
+
+    def update_flag_local(sign, flag)
+      case sign
+      when "+"
+        @flags.push(flag)
+      when "-"
+        @flags.delete(flag)
       end
     end
   end

data/lib/mournmail/summary_mode.rb

@@ -27,11 +27,11 @@ module Mournmail
     SUMMARY_MODE_MAP.define_key("j", :next_line)
     SUMMARY_MODE_MAP.define_key("m", :mournmail_visit_mailbox)
 
-    define_syntax :seen, /^\d+  .*/
-    define_syntax :unseen, /^\d+ u.*/
-    define_syntax :flagged, /^\d+ \$.*/
-    define_syntax :deleted, /^\d+ d.*/
-    define_syntax :answered, /^\d+ a.*/
+    define_syntax :seen, /^ *\d+  .*/
+    define_syntax :unseen, /^ *\d+ u.*/
+    define_syntax :flagged, /^ *\d+ \$.*/
+    define_syntax :deleted, /^ *\d+ d.*/
+    define_syntax :answered, /^ *\d+ a.*/
 
     def initialize(buffer)
       super(buffer)
@@ -43,7 +43,8 @@ module Mournmail
       return if uid.nil?
       Mournmail.background do
         mailbox = Mournmail.current_mailbox
-        mail = Mail.new(Mournmail.read_mail(mailbox, uid))
+        s, fetched = Mournmail.read_mail(mailbox, uid)
+        mail = Mail.new(s)
         message = mail.render
         next_tick do
           message_buffer = Buffer.find_or_new("*message*",
@@ -56,7 +57,7 @@ module Mournmail
           end
           window = Mournmail.message_window
           window.buffer = message_buffer
-          mark_as_seen(uid)
+          mark_as_seen(uid, !fetched)
           Mournmail.current_uid = uid
           Mournmail.current_mail = mail
         end
@@ -99,7 +100,7 @@ module Mournmail
       uid = selected_uid
       Mournmail.background do
         mailbox = Mournmail.current_mailbox
-        mail = Mail.new(Mournmail.read_mail(mailbox, uid))
+        mail = Mail.new(Mournmail.read_mail(mailbox, uid)[0])
         body = mail.render_body
         next_tick do
           Window.current = Mournmail.message_window
@@ -199,7 +200,7 @@ module Mournmail
       uid = selected_uid
       Mournmail.background do
         mailbox = Mournmail.current_mailbox
-        source = Mournmail.read_mail(mailbox, uid)
+        source, = Mournmail.read_mail(mailbox, uid)
         next_tick do
           source_buffer = Buffer.find_or_new("*message-source*",
                                              file_encoding: "ascii-8bit",
@@ -221,12 +222,12 @@ module Mournmail
     def selected_uid
       uid = @buffer.save_excursion {
         @buffer.beginning_of_line
-        if !@buffer.looking_at?(/\d+/)
+        if !@buffer.looking_at?(/ *\d+/)
           Mournmail.current_mail = nil
           Mournmail.current_uid = nil
           raise EditorError, "No message found"
         end
-        match_string(0).to_i
+        @buffer.match_string(0).to_i
       }
     end
 
@@ -253,10 +254,10 @@ module Mournmail
       end
     end
 
-    def mark_as_seen(uid)
+    def mark_as_seen(uid, update_server)
       summary_item = Mournmail.current_summary[uid]
       if summary_item && !summary_item.flags.include?(:Seen)
-        summary_item.set_flag(:Seen, update_server: false)
+        summary_item.set_flag(:Seen, update_server: update_server)
         Mournmail.current_summary.save
         update_flags(summary_item)
       end
@@ -281,8 +282,8 @@ module Mournmail
           @buffer.beginning_of_buffer
           uid = summary_item.uid
           flags_char = summary_item.flags_char
-          if @buffer.re_search_forward(/^#{uid} ./)
-            @buffer.replace_match("#{uid} #{flags_char}")
+          if @buffer.re_search_forward(/^( *#{uid}) ./)
+            @buffer.replace_match(@buffer.match_string(1) + " " + flags_char)
           end
         end
       end
@@ -294,7 +295,7 @@ module Mournmail
         raise EditorError, "No more mail"
       end
       begin
-        @buffer.re_search_forward(/^\d+ u/)
+        @buffer.re_search_forward(/^ *\d+ u/)
       rescue SearchError
         @buffer.forward_line
       end

data/lib/mournmail/utils.rb

@@ -133,13 +133,18 @@ module Mournmail
     end
   end
 
+  def self.mailbox_cache_path(mailbox)
+    dir = CONFIG[:mournmail_directory]
+    host = CONFIG[:mournmail_imap_host]
+    File.expand_path("cache/#{host}/#{mailbox}", dir)
+  end
+
   def self.read_mail(mailbox, uid)
-    path = File.expand_path("cache/#{mailbox}/#{uid}",
-                            CONFIG[:mournmail_directory])
+    path = File.join(mailbox_cache_path(mailbox), uid.to_s)
     begin
       File.open(path) do |f|
         f.flock(File::LOCK_SH)
-        f.read
+        [f.read, false]
       end
     rescue Errno::ENOENT
       imap_connect do |imap|
@@ -154,7 +159,7 @@ module Mournmail
           f.flock(File::LOCK_EX)
           f.write(s)
         end
-        s
+        [s, true]
       end
     end
   end

data/lib/mournmail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mournmail
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer