imap-backup 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4acc06bc3ae80d8d4ab9ac5c357ff123e73f2c798d98b94c3e36f3a82daee441
-  data.tar.gz: 2ca50fa37e148768e73fc91fd4035a691a8d5f6083a702127dc02c8237d64a19
+  metadata.gz: 4a03b28188aede7ee27bb741e32a40619a2fe58090631a6341eba5cffc2cefe4
+  data.tar.gz: d50ac5b602aa86f150846dc925962f727e1e0bcb830113eace96cec1038833e5
 SHA512:
-  metadata.gz: 135e5de500d5d1cae59f43fffe6c412b83d27dd26d96566019912198f13bbeb9784bd76c70ca6524caf85ff917073dc9e6ad7890836d5d9f8f4e5dd3b24cceb2
-  data.tar.gz: a9941e460943682553a20a32b5b8d497821485fec6971f15389e08359c6f59036ee6545aa5bb83e0326040b574c8a5ee57fa50d13a6011b2594c21945b4c8e95
+  metadata.gz: d5b95c61e9f505d63274ba73e50bc7e15cc44b9391e8fc1bc3cc8a70bfb59dd11c43bc41fe0334c70f089ccf15a5890c9ae9d3fe4631062a085a753836fd8f4a
+  data.tar.gz: a8657ca4282ea0a6e0037c6dc687265a23f2e0af16146900de9665aaf6a03f118d0895a33ee89a2dc788f0bb358b3651b90ddaf721ba588a949b92acd975781c

data/lib/imap/backup/downloader.rb

@@ -13,31 +13,45 @@ module Imap::Backup
     def run
       uids = folder.uids - serializer.uids
       count = uids.count
-      Imap::Backup::Logger.logger.debug "[#{folder.name}] #{count} new messages"
+      debug "#{count} new messages"
       uids.each_slice(block_size).with_index do |block, i|
-        offset = i * block_size + 1
         uids_and_bodies = folder.fetch_multi(block)
         if uids_and_bodies.nil?
           if block_size > 1
-            Imap::Backup::Logger.logger.debug("[#{folder.name}] Multi fetch failed for UIDs #{block.join(", ")}, switching to single fetches")
+            debug("Multi fetch failed for UIDs #{block.join(", ")}, switching to single fetches")
             @block_size = 1
             redo
           else
-            Imap::Backup::Logger.logger.debug("[#{folder.name}] Fetch failed for UID #{block[0]} - skipping")
+            debug("Fetch failed for UID #{block[0]} - skipping")
             next
           end
         end
 
+        offset = i * block_size + 1
         uids_and_bodies.each.with_index do |uid_and_body, j|
           uid = uid_and_body[:uid]
           body = uid_and_body[:body]
-          Imap::Backup::Logger.logger.debug(
-            "[#{folder.name}] uid: #{uid} (#{offset +j}/#{count}) - " \
-              "#{body.size} bytes"
-          )
-          serializer.save(uid, body)
+          case
+          when !body
+            info("Fetch returned empty body - skipping")
+          when !uid
+            info("Fetch returned empty UID - skipping")
+          else
+            debug("uid: #{uid} (#{offset + j}/#{count}) - #{body.size} bytes")
+            serializer.save(uid, body)
+          end
         end
       end
     end
+
+    private
+
+    def info(message)
+      Imap::Backup::Logger.logger.info("[#{folder.name}] #{message}")
+    end
+
+    def debug(message)
+      Imap::Backup::Logger.logger.debug("[#{folder.name}] #{message}")
+    end
   end
 end

data/lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 4
   MINOR    = 2
-  REVISION = 1
+  REVISION = 2
   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: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline