imap-backup 6.1.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a05fedc57275cadd2a1bd22efbe88ef5ec6ee72843400499cac8b8df8e80c35
-  data.tar.gz: f0e8e859b5fb1bb8480730b3ea62abc7470f5d0ddb469113bbdac0e4f2a88d1a
+  metadata.gz: c0d36730de07aa607526d3a37dc985089fa0ab41418e811edee58b7e88ba2762
+  data.tar.gz: e91d2b8f28ebd05a8b15f9e34c1b52648a937237b44e6eeee093e7996bf1232c
 SHA512:
-  metadata.gz: bfb4de1a3048a9f29ee30fb56c7493524a7d688a6eab2ec3307005ba3c8d341a99c961acd1d8f588384dc91571b4528482931e52724df42dff19a26553568fb0
-  data.tar.gz: a411ad26b4ce3eb631c97d94c9242c1eb48fd57d23cffcec84f5c829d9354b506115b6c8278ee38430e27f0d6ca1400d55f74adce5eb99f94db2963f235c6d7a
+  metadata.gz: 9af9e727577ad646f44b9fbae4d3e0d0f0f6cd9712f9d53e95f07b443c7eb87e99958c083416fc87c2000606936422b5ce9413578326673663390cac6ba2c11a
+  data.tar.gz: 176f00ebb3325900e040734599a7be3b9f6c9141c11ff358cd85bc70baf094c00b1d2753d7f2136b715d4839b0fa7bb84d237104f9b96df51b73dafd33e35b2f

data/lib/imap/backup/account/connection.rb

@@ -39,7 +39,14 @@ module Imap::Backup
       client
       ensure_account_folder
       each_folder do |folder, serializer|
-        next if !folder.exist?
+        begin
+          next if !folder.exist?
+        rescue Encoding::UndefinedConversionError
+          message = "Skipping backup for '#{folder.name}' " \
+                    "as it is not UTF-7 encoded correctly"
+          Logger.logger.info message
+          next
+        end
 
         Logger.logger.debug "[#{folder.name}] running backup"
         serializer.apply_uid_validity(folder.uid_validity)

data/lib/imap/backup/client/default.rb

@@ -7,14 +7,16 @@ module Imap::Backup
   class Client::Default
     extend Forwardable
     def_delegators :imap, *%i(
-      append authenticate create disconnect examine expunge
-      login responses select uid_fetch uid_search uid_store
+      append authenticate create expunge login
+      responses uid_fetch uid_search uid_store
     )
 
     attr_reader :args
+    attr_accessor :state
 
     def initialize(*args)
       @args = args
+      @state = nil
     end
 
     def list
@@ -26,6 +28,28 @@ module Imap::Backup
       mailbox_lists.map { |ml| extract_name(ml) }
     end
 
+    # Track mailbox selection during delegation to Net::IMAP instance
+
+    def disconnect
+      imap.disconnect
+      self.state = nil
+    end
+
+    def examine(mailbox)
+      return if state == [:examine, mailbox]
+
+      result = imap.examine(mailbox)
+      self.state = [:examine, mailbox]
+      result
+    end
+
+    def select(mailbox)
+      return if state == [:select, mailbox]
+
+      imap.select(mailbox)
+      self.state = [:select, mailbox]
+    end
+
     private
 
     def imap

data/lib/imap/backup/migrator.rb

@@ -24,7 +24,11 @@ module Imap::Backup
           "#{log_prefix} #{message.supplied_body.size} bytes"
         )
 
-        folder.append(message)
+        begin
+          folder.append(message)
+        rescue StandardError => e
+          Logger.logger.warn "#{log_prefix} append error: #{e}"
+        end
       end
     end
 

data/lib/imap/backup/version.rb

@@ -2,8 +2,8 @@ module Imap; end
 
 module Imap::Backup
   MAJOR    = 6
-  MINOR    = 1
-  REVISION = 0
+  MINOR    = 2
+  REVISION = 1
   PRE      = nil
   VERSION  = [MAJOR, MINOR, REVISION, PRE].compact.map(&:to_s).join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline