imap-backup 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a744249ff80a26be2c57655709be59d9678c9bb998dc1c9f3ea4bf3539d747
-  data.tar.gz: 4f44c050c66fe2ef2e136b46dec581a91f77ab4b650e9b3466a893540e481a24
+  metadata.gz: e0cd29188ed972abfb2b2ce21d237ce3b7aed5b434717ba64fa2e3475da38ded
+  data.tar.gz: 597b58cdee1ab1b5881ea29111ac85e7fdedfbaa370824d0d24ba1b19c869dcb
 SHA512:
-  metadata.gz: 66067924fda33810aff4b02aa047c20cd26ce3fc31d8e752fc43a8f78af3e1c952871fa0ba372c670a5ee399e7fc686f9df9601fc5cbb7caa6f2065b4ac95b90
-  data.tar.gz: 443a86c3bda9cc1652fc9d1c5619347c1d82498befed16851a6f8a227eaf3299813dd6a4084e1bb0d180170adb1b63ccf8e5d2a8bb19f0457611e7916d796c4d
+  metadata.gz: a3adc1984eea76a5ef993a40e89520a01997e6d01357e0a1e41cd4b58a4efc56801fc3d4f8801b95e828ec3a6a1e7884be974aaabf40f921a3faccdc99cf9b98
+  data.tar.gz: 55c0c91fdfb4829ba77be5292b4e475c6ea31e9e6e9ea5abf9702121f8a12c20b9b0105da5e1b97bcb2482105807c614530dea9e058d64af2cde96f7fd19348b

data/lib/email/mboxrd/message.rb

@@ -10,7 +10,7 @@ module Email::Mboxrd
 
     attr_reader :supplied_body
 
-    def self.from_serialized(serialized)
+    def self.clean_serialized(serialized)
       cleaned = serialized.gsub(/^>(>*From)/, "\\1")
       # Serialized messages in this format *should* start with a line
       #   From xxx yy zz
@@ -19,7 +19,11 @@ module Email::Mboxrd
         cleaned = cleaned.sub(/^From .*[\r\n]*/, "")
       end
       # rubocop:enable Style/IfUnlessModifier
-      new(cleaned)
+      cleaned
+    end
+
+    def self.from_serialized(serialized)
+      new(clean_serialized(serialized))
     end
 
     def initialize(supplied_body)

data/lib/imap/backup/thunderbird/mailbox_exporter.rb

@@ -40,7 +40,16 @@ module Imap::Backup
         end
       end
 
-      FileUtils.cp serializer.mbox_pathname, local_folder.full_path
+      File.open(local_folder.full_path, "w") do |f|
+        enumerator = Serializer::MboxEnumerator.new(serializer.mbox_pathname)
+        enumerator.each.with_index do |raw, i|
+          clean = Email::Mboxrd::Message.clean_serialized(raw)
+          timestamp = Time.now.strftime("%a %b %d %H:%M:%S %Y")
+          thunderbird_fom_line = "From - #{timestamp}"
+          output = "#{thunderbird_fom_line}\n#{clean}\n"
+          f.write output
+        end
+      end
 
       true
     end

data/lib/imap/backup/version.rb

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

data/lib/thunderbird/subdirectory.rb

@@ -77,17 +77,14 @@ class Thunderbird::Subdirectory
 
   def check
     case
-    when placeholder.exists? && !exists?
-      Kernel.puts "Can't set up folder '#{folder_path}': '#{placeholder.path}' exists, but '#{full_path}' is missing"
-      false
     when exists? && !placeholder.exists?
-      Kernel.puts "Can't set up folder '#{folder_path}': '#{full_path}' exists, but '#{placeholder.path}' is missing"
+      Kernel.puts "Can't set up folder '#{full_path}': '#{full_path}' exists, but '#{placeholder.path}' is missing"
       false
     when placeholder.exists? && !placeholder.regular?
-      Kernel.puts "Can't set up folder '#{folder_path}': '#{placeholder.path}' exists, but it is not a regular file"
+      Kernel.puts "Can't set up folder '#{full_path}': '#{placeholder.path}' exists, but it is not a regular file"
       false
     when exists? && !directory?
-      Kernel.puts "Can't set up folder '#{folder_path}': '#{full_path}' exists, but it is not a directory"
+      Kernel.puts "Can't set up folder '#{full_path}': '#{full_path}' exists, but it is not a directory"
       false
     else
       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Joe Yates
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -271,7 +271,7 @@ homepage: https://github.com/joeyates/imap-backup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -287,46 +287,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk
 test_files:
-- spec/features/helper.rb
-- spec/features/support/backup_directory.rb
-- spec/features/support/shared/message_fixtures.rb
-- spec/features/support/shared/connection_context.rb
-- spec/features/support/email_server.rb
-- spec/features/restore_spec.rb
-- spec/features/status_spec.rb
-- spec/features/backup_spec.rb
-- spec/support/higline_test_helpers.rb
-- spec/support/fixtures.rb
-- spec/support/silence_logging.rb
-- spec/gather_rspec_coverage.rb
-- spec/unit/email/provider/gmail_spec.rb
-- spec/unit/email/provider/fastmail_spec.rb
-- spec/unit/email/provider/base_spec.rb
-- spec/unit/email/provider/apple_mail_spec.rb
-- spec/unit/email/mboxrd/message_spec.rb
-- spec/unit/email/provider_spec.rb
-- spec/unit/imap/backup/cli/utils_spec.rb
-- spec/unit/imap/backup/cli/accounts_spec.rb
-- spec/unit/imap/backup/cli/local_spec.rb
+- spec/spec_helper.rb
+- spec/unit/imap/backup/serializer/mbox_spec.rb
+- spec/unit/imap/backup/serializer/mbox_store_spec.rb
+- spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
+- spec/unit/imap/backup/setup_spec.rb
+- spec/unit/imap/backup/logger_spec.rb
+- spec/unit/imap/backup/configuration_spec.rb
 - spec/unit/imap/backup/setup/account_spec.rb
 - spec/unit/imap/backup/setup/connection_tester_spec.rb
-- spec/unit/imap/backup/setup/folder_chooser_spec.rb
 - spec/unit/imap/backup/setup/asker_spec.rb
-- spec/unit/imap/backup/uploader_spec.rb
-- spec/unit/imap/backup/utils_spec.rb
-- spec/unit/imap/backup/configuration_spec.rb
-- spec/unit/imap/backup/setup_spec.rb
-- spec/unit/imap/backup/logger_spec.rb
-- spec/unit/imap/backup/serializer/mbox_store_spec.rb
-- spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
-- spec/unit/imap/backup/serializer/mbox_spec.rb
+- spec/unit/imap/backup/setup/folder_chooser_spec.rb
+- spec/unit/imap/backup/cli/accounts_spec.rb
+- spec/unit/imap/backup/cli/utils_spec.rb
+- spec/unit/imap/backup/cli/local_spec.rb
 - spec/unit/imap/backup/downloader_spec.rb
+- spec/unit/imap/backup/uploader_spec.rb
 - spec/unit/imap/backup/account/folder_spec.rb
 - spec/unit/imap/backup/account/connection_spec.rb
+- spec/unit/imap/backup/utils_spec.rb
 - spec/unit/imap/backup/client/default_spec.rb
-- spec/spec_helper.rb
+- spec/unit/email/mboxrd/message_spec.rb
+- spec/unit/email/provider/gmail_spec.rb
+- spec/unit/email/provider/apple_mail_spec.rb
+- spec/unit/email/provider/fastmail_spec.rb
+- spec/unit/email/provider/base_spec.rb
+- spec/unit/email/provider_spec.rb
+- spec/features/backup_spec.rb
+- spec/features/helper.rb
+- spec/features/restore_spec.rb
+- spec/features/status_spec.rb
+- spec/features/support/email_server.rb
+- spec/features/support/backup_directory.rb
+- spec/features/support/shared/connection_context.rb
+- spec/features/support/shared/message_fixtures.rb
+- spec/support/fixtures.rb
+- spec/support/silence_logging.rb
+- spec/support/higline_test_helpers.rb
 - spec/fixtures/connection.yml
+- spec/gather_rspec_coverage.rb