libis-format 1.3.8 → 1.3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 926fc551e289a3866aa7e79ba4b835eae9ab1cae31febc247746c59a8e6bed4c
-  data.tar.gz: 22ab9cab0fe38e3232fbf67805ae91432ffda56b1864eaab707efa2a8d5bde86
+  metadata.gz: ec695a5009a2c131983af21f4c773037731907280eb229982eeacc8f7c72bf6b
+  data.tar.gz: 48139c18c6b66ddc9b25941dcbecee30294c3d7124d889dd74fae34b2a176c74
 SHA512:
-  metadata.gz: bb57e0586eb783302b0b5cec06bdfec3a55f4901ed214555e602d7658a4f4908c142096145bbb0cd3573a7a56fb049a13cd9ceba85b1958efb0d70400f578a07
-  data.tar.gz: f30fa360afcc72db8c42713aa5b2d21a46616d8bdbe75566f29bb088cdfc3b9d11e83d1c77d22d9a9a10d00d5a383fcdddaa45386bfc187813a6aafa11cbb51b
+  metadata.gz: b9f232072ceed43e950d51869478c18e03cb79e157749a34e7580330a9e379f3008bd8f963461ea81261bdaf95b65d779b1d3c0efd1da86ef2d1fc729316cb43
+  data.tar.gz: cb40a76524a3854692b81baace242bf96a22c92bcde21192dffdaf6bd5afc187c7b4c7190866e0f0b9c17462d4392acec8b12e07fc6acaaf76192b171c37cb05

data/lib/libis/format/tool/msg_to_pdf.rb

@@ -3,10 +3,8 @@
 
 require_relative 'mail_to_pdf'
 
-require 'mapi/msg'
-require 'rfc_2047'
-
-Mapi::Log.level = Logger::Severity::INFO
+require 'msg_extractor'
+require 'word_wrap'
 
 module Libis
   module Format
@@ -15,45 +13,54 @@ module Libis
         protected
 
         def open_email(source)
+          msg = nil
+
           # Open the message
-          Mapi::Msg.open(source)
+          msg = MsgExtractor.open(source)
+
+          unless msg.is_a?(MsgExtractor::Message)
+            raise "File #{File.basename(source)} is not an Outlook message but a #{msg.class.name}"
+          end
+
+          msg
+        rescue StandardError => e
+          raise "Failed to open message: #{e.message}"
         end
 
-        def close_email(msg)
-          msg.close
+        def close_email(_msg)
           true
         end
 
         def get_body_html(msg)
           # Get the body of the message in HTML
-          body = msg.properties.body_html
+          body = msg.html_body
 
           # Embed plain body in HTML as a fallback
-          body ||= HTML_WRAPPER_TEMPLATE % msg.properties.body
+          body ||= HTML_WRAPPER_TEMPLATE % WordWrap.ww(msg.body, 120, false)
 
           # Worst case, just create empty body
           body ||= HTML_WRAPPER_TEMPLATE % ''
 
-          # Check and fix the character encoding
-          begin
-            # Try to encode into UTF-8
-            body.encode!('UTF-8', universal_newline: true)
-          rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError
-            begin
-              # If it fails, the text may be in Windows' Latin1 (ISO-8859-1)
-              body.force_encoding('ISO-8859-1').encode!('UTF-8', universal_newline: true)
-            rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError => e
-              # If that fails too, log a warning and replace the invalid/unknown with a ? character.
-              @warnings << "#{e.class}: #{e.message}"
-              body.encode!('UTF-8', universal_newline: true, invalid: :replace, undef: :replace)
-            end
-          end
+          # # Check and fix the character encoding
+          # begin
+          #   # Try to encode into UTF-8
+          #   body.encode!('UTF-8', universal_newline: true)
+          # rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError
+          #   begin
+          #     # If it fails, the text may be in Windows' Latin1 (ISO-8859-1)
+          #     body.force_encoding('ISO-8859-1').encode!('UTF-8', universal_newline: true)
+          #   rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError => e
+          #     # If that fails too, log a warning and replace the invalid/unknown with a ? character.
+          #     @warnings << "#{e.class}: #{e.message}"
+          #     body.encode!('UTF-8', universal_newline: true, invalid: :replace, undef: :replace)
+          #   end
+          # end
 
           body
         end
 
         def get_subject(msg)
-          find_hdr(msg.headers, 'Subject') || 'No Subject'
+          msg.subject || ''
         end
 
         def get_headers(msg)
@@ -61,17 +68,12 @@ module Libis
           html = ''
 
           %w[From To Cc Subject Date].each do |key|
-            value = find_hdr(msg.headers, key)
+            value = find_hdr(msg, key)
             next unless value
 
-            if key.casecmp('Date').zero?
-              begin
-                value = DateTime.parse(value).to_time.localtime
-                headers[key.downcase.to_sym] = value.iso8601
-                html += hdr_html(key, value.rfc2822)
-              rescue StandardError => e
-                logger.warn "Failed to parse date header '#{value}': #{e.message}"
-              end
+            if key.casecmp('Date').zero? && value.is_a?(Time)
+              headers[key.downcase.to_sym] = value.iso8601
+              html += hdr_html(key, value.rfc2822)
             else
               headers[key.downcase.to_sym] = value
               html += hdr_html(key, value)
@@ -83,69 +85,67 @@ module Libis
 
         def get_inline_attachment_data(attachments, cid)
           attachments.each do |attachment|
-            next unless attachment.properties.attach_content_id == cid
+            next unless attachment.content_id == cid
 
-            attachment.data.rewind
             return {
-              mime_type: attachment.properties.attach_mime_tag,
-              base64: Base64.encode64(attachment.data.read).gsub(/[\r\n]/, '')
+              mime_type: attachment.mime_type,
+              base64: Base64.encode64(attachment.data).gsub(/[\r\n]/, '')
             }
           end
           nil
         end
 
-        def get_file_attachments(attachments, used_files)
+        def get_file_attachments(attachments, _used_files)
           attachments.select do |attachment|
-            !attachment.properties.attachment_hidden &&
-              attachment.filename &&
-              !attachment.filename.empty? &&
-              !used_files.include?(attachment.filename)
+            !attachment.content_id && !attachment.embedded_message? && attachment.filename
           end
         end
 
         def get_mail_attachments(attachments)
-          attachments.select do |attachment|
-            !attachment.properties.attachment_hidden &&
-              attachment.instance_variable_get(:@embedded_msg)
-          end
+          attachments.select(&:embedded_message?)
         end
 
         def get_attachment_info(attachment)
-          if (sub_msg = attachment.instance_variable_get(:@embedded_msg))
+          if attachment.embedded_message?
 
             {
-              embedded_msg: sub_msg,
-              filename: attachment.properties[:display_name] || sub_msg.subject || ''
+              embedded_msg: attachment.data,
+              filename: attachment.message&.subject || 'email'
             }
 
           elsif attachment.filename
-            io = StringIO.new
-            attachment.save(io)
-            io.rewind
 
             {
-              data: io.string,
+              data: attachment.data,
               filename: attachment.filename
             }
 
           else
             {
-              filename: attachment.properties[:display_name] || 'unknown'
+              filename: attachment.mime_type || 'unknown'
             }
           end
         end
 
         private
 
-        def find_hdr(list, key)
-          keys = list.keys
-          if (k = keys.find { |x| x.to_s =~ /^#{key}$/i })
-            v = list[k]
-            v = v.first if v.is_a? Array
-            v = Rfc2047.decode(v).strip if v.is_a? String
-            return v
+        def find_hdr(msg, key)
+          value = if key.casecmp('From').zero?
+                    msg.sender
+                  else
+                    msg.send(key.downcase.to_sym)
+                  end
+
+          if value.is_a?(Array)
+            value.compact.empty? ? nil : value.compact.map(&:to_s).join(', ')
+
+          elsif value.is_a?(Time)
+            value.localtime
+
+          else
+            value.to_s
+
           end
-          nil
         end
       end
     end

data/lib/libis/format/version.rb

@@ -2,6 +2,6 @@
 
 module Libis
   module Format
-    VERSION = '1.3.8'
+    VERSION = '1.3.8.1'
   end
 end

data/libis-format.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
   spec.add_runtime_dependency 'deep_dive', '~> 0.3'
-  spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
+  # spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
   spec.add_runtime_dependency 'libis-tools', '~> 1.1'
   spec.add_runtime_dependency 'mail', '~> 2.9'
   spec.add_runtime_dependency 'mini_magick', '~> 5.0.1'
+  spec.add_runtime_dependency 'msg_extractor', '~> 0.1'
   spec.add_runtime_dependency 'naturally', '~> 2.2'
   spec.add_runtime_dependency 'new_rfc_2047', '~> 1.0'
   spec.add_runtime_dependency 'os', '~> 1.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.8.1
 platform: ruby
 authors:
 - Kris Dekeyser
@@ -38,61 +38,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: libis-mapi
+  name: libis-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: libis-tools
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: msg_extractor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: naturally
   requirement: !ruby/object:Gem::Requirement