imap-backup 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00576d7b3a0482f2e2ede92e545a5bbebcdf5ab2a688feb8e0c54281a1d9ba9a
-  data.tar.gz: e8bc14ff755f817cb08f4b979b6c689d4ee87c1b9d96acca4d0dc2a8297a40a7
+  metadata.gz: 6d4b9386097e77af34706992fb42b6ff9edd3a62a3cfb98e0b3363d864ee75dc
+  data.tar.gz: d72ec8493ea2436ccb033f2957d44236b71d3c607e25b15b0b755e93f011da10
 SHA512:
-  metadata.gz: 155476a2d92177685b58802d1431a15975161fcee512f43ee79cb332078faba8e0247f81020eb4c92c20fdb308ec6bb1650136cf1d92f468e4ece68142717e67
-  data.tar.gz: ddd269797169fdbc255ef907bb30a9c66775709ad32bc10f2a3d6ec75da441625269db307ed3bfa8e06dd3f076ff313e6124d47be73654c1f2b2cc8202e1f55a
+  metadata.gz: ab38ba548fa009c6f718f8da9b9fbb971751297eac03d2839e14f247c06d6858a155350291619090ef8165ffeb865674a19ef51c13dbf1220928106abfc79fa5
+  data.tar.gz: ad4e17a2b6b0b5a9ee1cc4737c324981069525a129018278514e51e8664008c71fc610539df58a2da590084bb7e3c46cd635fe1409ba0b53ad56bd241edfb9c8

data/lib/imap/backup/account.rb

@@ -18,12 +18,13 @@ module Imap::Backup
       @server = options[:server]
       @connection_options = options[:connection_options]
       @multi_fetch_size = options[:multi_fetch_size]
+      @connection = nil
       @changes = {}
       @marked_for_deletion = false
     end
 
     def connection
-      Account::Connection.new(self)
+      @connection ||= Account::Connection.new(self)
     end
 
     def valid?
@@ -114,6 +115,7 @@ module Imap::Backup
         changes[field] = {from: current, to: value} if value != current
       end
 
+      @connection = nil
       instance_variable_set(key, value)
     end
   end

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

@@ -12,6 +12,15 @@ module Imap::Backup
       @loaded = false
       @uid_validity = nil
       @uids = nil
+      @version = nil
+    end
+
+    def valid?
+      return false if !exist?
+      return false if version != CURRENT_VERSION
+      return false if !uid_validity
+
+      true
     end
 
     def append(uid)
@@ -19,8 +28,10 @@ module Imap::Backup
       save
     end
 
-    def exist?
-      File.exist?(pathname)
+    def delete
+      return if !exist?
+
+      File.unlink(pathname)
     end
 
     def include?(uid)
@@ -66,12 +77,21 @@ module Imap::Backup
       save
     end
 
+    def version
+      ensure_loaded
+      @version
+    end
+
     private
 
     def pathname
       "#{folder_path}.imap"
     end
 
+    def exist?
+      File.exist?(pathname)
+    end
+
     def ensure_loaded
       return if loaded
 
@@ -79,9 +99,11 @@ module Imap::Backup
       if data
         @uids = data[:uids].map(&:to_i)
         @uid_validity = data[:uid_validity]
+        @version = data[:version]
       else
         @uids = []
         @uid_validity = nil
+        @version = CURRENT_VERSION
       end
       @loaded = true
     end
@@ -97,6 +119,8 @@ module Imap::Backup
         return nil
       end
 
+      return nil if !data.key?(:version)
+      return nil if !data.key?(:uid_validity)
       return nil if !data.key?(:uids)
       return nil if !data[:uids].is_a?(Array)
 
@@ -109,7 +133,7 @@ module Imap::Backup
       raise "Cannot save metadata without a uid_validity" if !uid_validity
 
       data = {
-        version: CURRENT_VERSION,
+        version: @version,
         uid_validity: @uid_validity,
         uids: @uids
       }

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

@@ -6,14 +6,20 @@ module Imap::Backup
       @folder_path = folder_path
     end
 
+    def valid?
+      exist?
+    end
+
     def append(message)
       File.open(pathname, "ab") do |file|
         file.write message
       end
     end
 
-    def exist?
-      File.exist?(pathname)
+    def delete
+      return if !exist?
+
+      File.unlink(pathname)
     end
 
     def length
@@ -41,5 +47,15 @@ module Imap::Backup
         f.truncate(length)
       end
     end
+
+    def touch
+      File.open(pathname, "a") {}
+    end
+
+    private
+
+    def exist?
+      File.exist?(pathname)
+    end
   end
 end

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

@@ -8,20 +8,18 @@ module Imap::Backup
 
     def run
       digit = 0
-      name = nil
+      folder = nil
 
       loop do
         extra = digit.zero? ? "" : "-#{digit}"
-        name = "#{serializer.folder}-#{serializer.uid_validity}#{extra}"
-        new_folder_path = Serializer.folder_path_for(path: serializer.path, folder: name)
-        test_mbox = Serializer::Mbox.new(new_folder_path)
-        test_imap = Serializer::Imap.new(new_folder_path)
-        break if !test_mbox.exist? && !test_imap.exist?
+        folder = "#{serializer.folder}-#{serializer.uid_validity}#{extra}"
+        test = Serializer.new(serializer.path, folder)
+        break if !test.validate!
 
         digit += 1
       end
 
-      name
+      folder
     end
   end
 end

data/lib/imap/backup/serializer.rb

@@ -28,10 +28,25 @@ module Imap::Backup
       @folder = folder
     end
 
+    # Returns true if there are existing, valid files
+    # false otherwise (in which case any existing files are deleted)
+    def validate!
+      return true if imap.valid? && mbox.valid?
+
+      imap.delete
+      @imap = nil
+      mbox.delete
+      @mbox = nil
+
+      false
+    end
+
     def apply_uid_validity(value)
+      validate!
+
       case
       when uid_validity.nil?
-        imap.uid_validity = value
+        internal_force_uid_validity(value)
         nil
       when uid_validity == value
         # NOOP
@@ -42,39 +57,45 @@ module Imap::Backup
     end
 
     def force_uid_validity(value)
-      imap.uid_validity = value
+      validate!
+
+      internal_force_uid_validity(value)
     end
 
     def append(uid, message)
+      validate!
+
       appender = Serializer::Appender.new(folder: folder, imap: imap, mbox: mbox)
       appender.run(uid: uid, message: message)
     end
 
     def load(uid_maybe_string)
+      validate!
+
       uid = uid_maybe_string.to_i
       message_index = imap.index(uid)
       return nil if message_index.nil?
 
-      load_nth(message_index)
+      internal_load_nth(message_index)
     end
 
     def load_nth(index)
-      enumerator = Serializer::MboxEnumerator.new(mbox.pathname)
-      enumerator.each.with_index do |raw, i|
-        next if i != index
+      validate!
 
-        return Email::Mboxrd::Message.from_serialized(raw)
-      end
-      nil
+      internal_load_nth(index)
     end
 
     def each_message(required_uids, &block)
+      validate!
+
       return enum_for(:each_message, required_uids) if !block
 
       enumerator = Serializer::MessageEnumerator.new(imap: imap, mbox: mbox)
       enumerator.run(uids: required_uids, &block)
     end
 
+    private
+
     def rename(new_name)
       destination = self.class.folder_path_for(path: path, folder: new_name)
       ensure_containing_directory(new_name)
@@ -82,7 +103,20 @@ module Imap::Backup
       imap.rename destination
     end
 
-    private
+    def internal_force_uid_validity(value)
+      imap.uid_validity = value
+      mbox.touch
+    end
+
+    def internal_load_nth(index)
+      enumerator = Serializer::MboxEnumerator.new(mbox.pathname)
+      enumerator.each.with_index do |raw, i|
+        next if i != index
+
+        return Email::Mboxrd::Message.from_serialized(raw)
+      end
+      nil
+    end
 
     def mbox
       @mbox ||=
@@ -115,7 +149,7 @@ module Imap::Backup
       # Clear memoization so we get empty data
       @mbox = nil
       @imap = nil
-      imap.uid_validity = value
+      internal_force_uid_validity(value)
 
       new_name
     end

data/lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 6
   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: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline