imap-backup 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1392301e243a9affe750a9361f14622228879596b8cb0a29e4944dd91af52d44
-  data.tar.gz: d85f59f5387d5f3c5ac1f6ce97a4a2e5a685ca675b02be3982c914774485d5fc
+  metadata.gz: 12d5752520f0b47c240fe8bc3ac7e600bea9229804c9f2c22c2b5c5218818e79
+  data.tar.gz: 67da4a6a56f0914ad18f44340c52b759d0a5a74a70f32aafd0bb0600fd34c4e9
 SHA512:
-  metadata.gz: ef636f637cf6ab48a173439e6d4c908fa7bf0b8a171a7ba60a80b83062e95d30aafba0e52a4647b5c74b23a40b7504132803ad4ddc57907e3b08298e11b9a26c
-  data.tar.gz: 1274d7462c5e302bd1ea84529b12d74e6cc0ebe47ba6d755e2f23cdb5829dfde6fdde858c2640abea5f6f13eab8e5867334e82f5e4b7649ae41385a49f5706ca
+  metadata.gz: 0ab9fe8ce61dcfe6efcbf77415eab8bc6fb4813f10cf4b7f33f7378ac00977a5bb106086e201168bfb8117be3957c7aa9b4bdb513255ab0100fa8b7064f3b2b8
+  data.tar.gz: 14f878065e0603ca18d298f6d209ad1df51d9814487c11fee7ab31b05212a29ad162052831fc95b848abf65ec1ef4152d263f8ae4478e21e6873f2d509c13fb8

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

@@ -27,67 +27,66 @@ module Imap::Backup
 
       Account::FolderEnsurer.new(account: account).run
       Account::LocalOnlyFolderDeleter.new(account: account).run if account.mirror_mode
-      each_folder do |folder, serializer|
-        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
+      backup_folders = Account::BackupFolders.new(
+        client: account.client, account: account
+      )
+      if backup_folders.none?
+        Logger.logger.warn "Account #{account.username}: No folders found to backup"
+        return
+      end
+      backup_folders.each do |folder|
+        backup_folder folder
+      end
+    end
+
+    private
 
-        Logger.logger.debug "[#{folder.name}] running backup"
+    def backup_folder(folder)
+      serializer = Serializer.new(account.local_path, folder.name)
+      begin
+        return if !folder.exist?
+      rescue Encoding::UndefinedConversionError
+        message = "Skipping backup for '#{folder.name}' " \
+                  "as it is not UTF-7 encoded correctly"
+        Logger.logger.info message
+        return
+      end
 
-        serializer.apply_uid_validity(folder.uid_validity)
+      Logger.logger.debug "[#{folder.name}] running backup"
 
-        download_serializer =
-          case account.download_strategy
-          when "direct"
-            serializer
-          when "delay_metadata"
-            Serializer::DelayedMetadataSerializer.new(serializer: serializer)
-          else
-            raise "Unknown download strategy '#{account.download_strategy}'"
-          end
+      serializer.apply_uid_validity(folder.uid_validity)
 
-        downloader = Downloader.new(
-          folder,
-          download_serializer,
-          multi_fetch_size: account.multi_fetch_size,
-          reset_seen_flags_after_fetch: account.reset_seen_flags_after_fetch
-        )
-        # rubocop:disable Lint/RescueException
-        download_serializer.transaction do
-          downloader.run
-        rescue Exception => e
-          message = <<~ERROR
-            #{self.class} error #{e}
-            #{e.backtrace.join("\n")}
-          ERROR
-          Logger.logger.error message
-          download_serializer.rollback
-          raise e
-        end
-        # rubocop:enable Lint/RescueException
-        if account.mirror_mode
-          Logger.logger.info "Mirror mode - Deleting messages only present locally"
-          LocalOnlyMessageDeleter.new(folder, serializer).run
+      download_serializer =
+        case account.download_strategy
+        when "direct"
+          serializer
+        when "delay_metadata"
+          Serializer::DelayedMetadataSerializer.new(serializer: serializer)
+        else
+          raise "Unknown download strategy '#{account.download_strategy}'"
         end
-        FlagRefresher.new(folder, serializer).run if account.mirror_mode || refresh
-      end
-    end
-
-    private
 
-    def each_folder
-      backup_folders = Account::BackupFolders.new(
-        client: account.client, account: account
+      downloader = Downloader.new(
+        folder,
+        download_serializer,
+        multi_fetch_size: account.multi_fetch_size,
+        reset_seen_flags_after_fetch: account.reset_seen_flags_after_fetch
       )
-      backup_folders.each do |folder|
-        serializer = Serializer.new(account.local_path, folder.name)
-        yield folder, serializer
+      download_serializer.transaction do
+        downloader.run
+      rescue StandardError => e
+        message = <<~ERROR
+          #{self.class} error #{e}
+          #{e.backtrace.join("\n")}
+        ERROR
+        Logger.logger.error message
+        raise e
+      end
+      if account.mirror_mode
+        Logger.logger.info "Mirror mode - Deleting messages only present locally"
+        LocalOnlyMessageDeleter.new(folder, serializer).run
       end
+      FlagRefresher.new(folder, serializer).run if account.mirror_mode || refresh
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Imap::Backup
   class Account; end
 
   class Account::BackupFolders
+    include Enumerable
+
     attr_reader :account
     attr_reader :client
 

data/lib/imap/backup/cli/backup.rb

@@ -19,7 +19,12 @@ module Imap::Backup
       def run
         config = load_config(**options)
         exit_code = nil
-        requested_accounts(config).each do |account|
+        accounts = requested_accounts(config)
+        if accounts.none?
+          Logger.logger.warn "No matching accounts found to backup"
+          return
+        end
+        accounts.each do |account|
           backup = Account::Backup.new(account: account, refresh: refresh)
           backup.run
         rescue StandardError => e

data/lib/imap/backup/serializer/delayed_metadata_serializer.rb

@@ -20,23 +20,13 @@ module Imap::Backup
     def transaction(&block)
       tsx.fail_in_transaction!(:transaction, message: "nested transactions are not supported")
 
-      # rubocop:disable Lint/RescueException
       tsx.begin({metadata: []}) do
         mbox.transaction do
           block.call
 
           commit
-        rescue Exception => e
-          message = <<~ERROR
-            #{self.class} error #{e}
-            #{e.backtrace.join("\n")}
-          ERROR
-          Logger.logger.error message
-          mbox.rollback
-          raise e
         end
       end
-      # rubocop:enable Lint/RescueException
     end
 
     def append(uid, message, flags)
@@ -56,6 +46,7 @@ module Imap::Backup
           imap.append m[:uid], m[:length], flags: m[:flags]
         end
       rescue Exception => e
+        Logger.logger.error "#{self.class} handling #{e.class}"
         imap.rollback
         raise e
       end

data/lib/imap/backup/serializer/imap.rb

@@ -31,6 +31,7 @@ module Imap::Backup
 
         save_internal(version: version, uid_validity: uid_validity, messages: messages) if tsx.data
       rescue Exception => e
+        Logger.logger.error "#{self.class} handling #{e.class}"
         rollback
         raise e
       end

data/lib/imap/backup/serializer/mbox.rb

@@ -15,10 +15,9 @@ module Imap::Backup
     def transaction(&block)
       tsx.fail_in_transaction!(:transaction, message: "nested transactions are not supported")
 
-      # rubocop:disable Lint/RescueException
       tsx.begin({savepoint: {length: length}}) do
         block.call
-      rescue Exception => e
+      rescue StandardError => e
         message = <<~ERROR
           #{self.class} error #{e}
           #{e.backtrace.join("\n")}
@@ -26,15 +25,17 @@ module Imap::Backup
         Logger.logger.error message
         rollback
         raise e
+      rescue SignalException => e
+        Logger.logger.error "#{self.class} handling #{e.class}"
+        rollback
+        raise e
       end
-      # rubocop:enable Lint/RescueException
     end
 
     def rollback
       tsx.fail_outside_transaction!(:rollback)
 
       rewind(tsx.data[:savepoint][:length])
-      tsx.clear
     end
 
     def valid?

data/lib/imap/backup/serializer.rb

@@ -37,9 +37,6 @@ module Imap::Backup
       block.call
     end
 
-    def rollback
-    end
-
     # Returns true if there are existing, valid files
     # false otherwise (in which case any existing files are deleted)
     def validate!

data/lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 11
   MINOR    = 0
-  REVISION = 0
+  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: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline