imap-backup 13.2.0 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef98e7550571026f402c2fa7c82b37707be3c79ee23bd190dd091d234e9c9e7
-  data.tar.gz: f2f7508af8f492cfd19972ba11e3ca651bc417f69b43dd5f78d511500f5373af
+  metadata.gz: 52be0d33c65e865c04931e81821a563e8203a001a951b8ec6624f0fded2180aa
+  data.tar.gz: 2fece56b157329aa6e8cd0bc73d66d5ec3c3923f126822977910dc904d955a1a
 SHA512:
-  metadata.gz: 7d6bb21bffea6ac0c7dc70c073700fe532d3fe5492ad9fd54f668070b682b17e958c152f07e91807a3c5f6aa8e354c7cdb0ca188cd2398bccc16951b421d4ea0
-  data.tar.gz: 2a1f679f55a047626cb85b2bd8b3b69cadbce20426af6ad278fab2f24758e379276575dc0149265b7783804da18f433731672cbaf34e0bf7c52ee38fa26a258e
+  metadata.gz: 26c0c0434bf7743a3ce9b8b6c0f24b05b14682f4e52fcacf4813cec7a913df720f6413a066b25db810e04d4e18411cfbd79119430f37785186b3013757a2e76d
+  data.tar.gz: 3f250c3272221488bb8b9c08b1f68198a1a6b3f45bd75c31ccc6b2284c0e2130d65bcd91783c6c85b65b4e1bbdbe09378a1ff15e595f8ab3ae016d2faeb53aee

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

@@ -52,10 +52,7 @@ module Imap::Backup
     end
 
     def clean_up
-      if account.mirror_mode
-        Logger.logger.info "Mirror mode - Deleting messages only present locally"
-        LocalOnlyMessageDeleter.new(folder, serializer).run
-      end
+      LocalOnlyMessageDeleter.new(folder, serializer).run if account.mirror_mode
       FlagRefresher.new(folder, serializer).run if account.mirror_mode || refresh
     end
 

data/lib/imap/backup/local_only_message_deleter.rb

@@ -1,3 +1,5 @@
+require "imap/backup/logger"
+
 module Imap; end
 
 module Imap::Backup
@@ -15,7 +17,13 @@ module Imap::Backup
     # but that would require a garbage collection later.
     def run
       local_only_uids = serializer.uids - folder.uids
-      return if local_only_uids.empty?
+      if local_only_uids.empty?
+        Logger.logger.debug "There are no 'local-only' messages to delete"
+        return
+      end
+
+      Logger.logger.info "Deleting messages only present locally"
+      Logger.logger.debug "Messages to be deleted: #{local_only_uids.inspect}"
 
       serializer.filter do |message|
         !local_only_uids.include?(message.uid)

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

@@ -26,6 +26,8 @@ module Imap::Backup
           block.call
 
           commit
+
+          serializer.reload
         end
       end
     end

data/lib/imap/backup/serializer.rb

@@ -62,9 +62,8 @@ module Imap::Backup
 
     def delete
       imap.delete
-      @imap = nil
       mbox.delete
-      @mbox = nil
+      reload
     end
 
     def apply_uid_validity(value)
@@ -130,8 +129,7 @@ module Imap::Backup
       new_imap.rename imap.folder_path
       mbox.delete
       new_mbox.rename mbox.folder_path
-      @imap = nil
-      @mbox = nil
+      reload
     end
 
     def folder_path
@@ -142,6 +140,11 @@ module Imap::Backup
       @sanitized ||= Naming.to_local_path(folder)
     end
 
+    def reload
+      @imap = nil
+      @mbox = nil
+    end
+
     private
 
     def rename(new_name)

data/lib/imap/backup/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 13.2.0
+  version: 13.3.0
 platform: ruby
 authors:
 - Joe Yates