imap_mogura 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 993c63cfc198ecb1bf303676897fe03825ebd959b84b80f543c3e9268dd418de
-  data.tar.gz: a67fa16f14228240da1eecdf806bd9208d9019dfa98bcd13a20d3ed1aeaeacf5
+  metadata.gz: e14cd28606dbecabfd04544f634f81cf8378412f64a4af268b97300e754d9c55
+  data.tar.gz: 3b3f86b413c84f8d4bfc6a889bf197a54793210b212d9db794a5a40717f6ba1a
 SHA512:
-  metadata.gz: 8530a54d7aa22e3267f31eec06f7f5c125b1d908b1b6a2677fa7a6699f3ec3c343fdc0bc5003d7f7be26a05ddcadc0bf5c947c0d38e445faee86e3a90081dc64
-  data.tar.gz: 50cce8e16ee1f23bd198da3fcb984c33d537800a84bc0d41a48a0a3b0c252d738051b140cb22646d5f7344c3ac1d87bffaa51895cae542e58cfc2c5d1138b170
+  metadata.gz: 717b2e6eee24de47f2219cc6331a0bcf78476505b45ee28f7b2b8ff453bc8c63792e14926e7530563dea2f8b1c8240b30342e08b30beb9457ab71cb47d74a957
+  data.tar.gz: f5ef0e70a29a0d5c10277a153ee1989614b1b697418deda0a9d4fa9bee6a9f75a331cdd892dcd4d88f3c83cc78f63c91f73a50aa2ed2966b69a49d9c70a955d7

data/lib/imap_mogura/cli.rb

@@ -53,9 +53,11 @@ module ImapMogura
         monitor_recents_on_mailbox(imap_handler, target_mailbox) do
           # find mails with search keys on the target mailbox and handle them
           imap_handler.find_and_handle_mails(target_mailbox, search_keys) do |message_id|
-            warn "mail (id = #{message_id} on \"#{target_mailbox}\") is recent"
+            warn "a mail is recent on \"#{target_mailbox}\""
 
             filter_mail(imap_handler, rules, target_mailbox, message_id, dry_run: dry_run)
+
+            imap_handler.close_operation_for_mailbox(target_mailbox)
           end
         end
       end
@@ -219,7 +221,7 @@ module ImapMogura
       handle_mail_fetch_error_and_preprocess_retrying(e, retry_count)
 
       # retry monitor recents on mailbox itself with retry count to be incremented
-      warn "retry monitoring mails on #{e.mailbox}..."
+      warn "retry monitoring mails on \"#{e.mailbox}\"..."
 
       monitor_recents_on_mailbox(imap_handler, mailbox, retry_count + 1)
     end
@@ -228,43 +230,32 @@ module ImapMogura
       imap_handler.find_and_handle_mails(mailbox, search_keys) do |message_id|
         filter_mail(imap_handler, rules, mailbox, message_id, dry_run: dry_run)
       end
+
+      imap_handler.close_operation_for_mailbox(mailbox)
     rescue IMAPHandler::MailFetchError => e
       handle_mail_fetch_error_and_preprocess_retrying(e, retry_count)
 
       # retry filter all mails itself with retry count to be incremented
-      warn "retry filtering all mails on #{e.mailbox}"
+      warn "retry filtering all mails on \"#{e.mailbox}\""
 
       filter_mails(imap_handler, rules, mailbox, search_keys, retry_count + 1, dry_run: dry_run)
     end
 
-    def handle_mail_fetch_error_and_preprocess_retrying(error, retry_count)
-      warn "failed to fetch mail (id = #{error.message_id} on mailbox #{error.mailbox}): #{error.bad_response_error_message}"
-
-      # if retry_count is over the threshold, abort processing
-      raise Thor::Error, "retry count is over the threshold, stop processing" unless retry_count < 3
-
-      warn "wait a moment..."
-
-      sleep 10
-    end
-
     def filter_mail(imap_handler, rules, mailbox, message_id, dry_run: false)
       mail = imap_handler.fetch_header(mailbox, message_id)
 
       warn "# filtering mail on \"#{mailbox}\" of subject \"#{mail.subject}\"..."
 
       rules.each do |rule_set|
-        try_to_filter_mail_for_rule_set(imap_handler, rule_set, mailbox, message_id, mail, dry_run: dry_run)
+        break if try_to_filter_mail_for_rule_set(imap_handler, rule_set, mailbox, message_id, mail, dry_run: dry_run)
       end
-
-      imap_handler.close_operation_for_mailbox(mailbox)
     end
 
     def try_to_filter_mail_for_rule_set(imap_handler, rule_set, mailbox, message_id, mail, dry_run: false)
       dst_mailbox = rule_set.destination
       rule = rule_set.rule
 
-      return unless rule.match?(mail)
+      return nil unless rule.match?(mail)
 
       warn "the mail matches for the rule of the destination \"#{dst_mailbox}\""
       warn "moving the mail..."
@@ -279,6 +270,19 @@ module ImapMogura
           warn "moving skipped because the destination is the same with the current mailbox \"#{mailbox}\""
         end
       end
+
+      dst_mailbox
+    end
+
+    def handle_mail_fetch_error_and_preprocess_retrying(error, retry_count)
+      warn "failed to fetch the mail on \"#{error.mailbox}\": #{error.bad_response_error_message}"
+
+      # if retry_count is over the threshold, abort processing
+      raise Thor::Error, "retry count is over the threshold, stop processing" unless retry_count < 3
+
+      warn "wait a moment..."
+
+      sleep 10
     end
   end
 end

data/lib/imap_mogura/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImapMogura
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap_mogura
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - ysk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64