libis-format 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19055f943473fa0d2a9a1fdebf499c87652fcab845239a4b1f21341229ad08ad
-  data.tar.gz: f6f64bcaf5472f0e11aceb2cbe97b3f367b0ed4ccc4dfc389e5857f191c59897
+  metadata.gz: a1b5fdec2f726d83572f66f78b361b8500247bcf5bdcce56e633998b88758bc4
+  data.tar.gz: 0b09d4cc45338b9c1060c89d80f94ad171e8d2bc43da17b20cd2357521ef78f4
 SHA512:
-  metadata.gz: 7b0ee24177c3f541a8cd12733e04a04649d03b2785c68c8eaa44ca3fdebd7c657346afc9a824d59e872666bfa3a657483b00b6126970cc739ef8433889621847
-  data.tar.gz: 0bdbc5a928d6e556a816f65d05f2151e6b6ac331de37ce2d12030ace291f2b4cae452420236d9d5371f3566a7346f60854976dc33181e17549663b8ada5302f6
+  metadata.gz: 5ad4a140bfa6bedf2d7b915ec1a51b23fd9b4efdacf468e1cae1505a54c72b0733c6ee3d20981347da3f9fae8a8656416a953754bdc893decb8021f40a58b499
+  data.tar.gz: '0854af4151b126b6d2cb3d8fdd04c2186dcd5dac294b9a800db0256ed0955c3f1d86d54853ea39fbb295fdf5f71d7a016e6e49e71988e3c7f7c595f5a1c9a33e'

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

@@ -5,7 +5,10 @@ require 'rfc_2047'
 require 'cgi'
 require 'pdfkit'
 
+require 'time'
+
 require 'fileutils'
+require 'pathname'
 
 require 'libis/format/config'
 
@@ -49,10 +52,10 @@ module Libis
           target_format = options.delete(:to_html) ? :HTML : :PDF
           result = msg_to_pdf(msg, target, target_format, options)
           msg.close
-          return result
+          result
         end
 
-        def msg_to_pdf(msg, target, target_format, pdf_options, reraise: false)
+        def msg_to_pdf(msg, target, target_format, pdf_options, root_msg: true)
 
           # Make sure the target directory exists
           outdir = File.dirname(target)
@@ -116,6 +119,11 @@ module Libis
             end
           end
 
+          [:date].each do |key|
+            next unless headers[key]
+            headers[key] = DateTime.parse(headers[key]).to_time.localtime.iso8601
+          end
+
           # Add header section to the HTML body
           unless hdr_html.empty?
             # Insert header block styles
@@ -139,26 +147,28 @@ module Libis
           body.gsub!(IMG_CID_PLAIN_REGEX) do |match|
 # puts "CID found: #{match}, looking for #{$1}"
             data = getAttachmentData(attachments, $1)
-            unless data
-# puts "cid #{$1} not found"
-              return '<img src=""/>'
-            end
+            if data
 # puts "cid #{$1} data: #{data.inspect}"
-            used_files << $1
-            "<img src=\"data:#{data[:mime_type]};base64,#{data[:base64]}\"/>"
+              used_files << $1
+              "<img src=\"data:#{data[:mime_type]};base64,#{data[:base64]}\"/>"
+            else
+  # puts "cid #{$1} not found"
+              '<img src=""/>'
+            end
           end
           
           # Then process HTML img tags with CID entries
           body.gsub!(IMG_CID_HTML_REGEX) do |match|
 # puts "CID found: #{match}, looking for #{$1}"
             data = getAttachmentData(attachments, $1)
-            unless data
-# puts "cid #{$1} not found"
-              return ''
-            end
+            if  data
 # puts "cid #{$1} data: #{data.inspect}"
             used_files << $1
             "data:#{data[:mime_type]};base64,#{data[:base64]}"
+            else
+# puts "cid #{$1} not found"
+              ''
+            end
           end
 
           # Create PDF
@@ -196,15 +206,15 @@ module Libis
           # ----------------
           outdir = File.join(outdir, "#{File.basename(target)}.attachments")
           digits = ((attachments.count + 1)/ 10) + 1
-          i = 0
+          i = 1
           attachments.delete_if {|a| a.properties.attachment_hidden}.each do |a|
             prefix = "#{"%0*d" % [digits, i]}-"
             if sub_msg = a.instance_variable_get(:@embedded_msg)
 # puts "Embedded email message ..."
               subject = a.properties[:display_name] || sub_msg.subject || ""
-              file = File.join(outdir, "#{prefix}#{subject}.#{target_format.to_s.downcase}")
+              file = File.join(outdir, "#{prefix}#{subject}.msg.#{target_format.to_s.downcase}")
 
-              result = msg_to_pdf(sub_msg, file, target_format, pdf_options, reraise: true)
+              result = msg_to_pdf(sub_msg, file, target_format, pdf_options, root_msg: false)
               if e = result[:error]
                 raise 
               end
@@ -223,6 +233,13 @@ module Libis
             end
             i += 1
           end
+
+          if root_msg
+            p = Pathname(File.dirname(files.first))
+            files[1..].each do |f|
+              (headers[:attachments] ||= []) << Pathname.new(f).relative_path_from(p).to_s
+            end
+          end
           
           {
             command: {status: 0},
@@ -234,7 +251,7 @@ module Libis
         rescue Exception => e
 # puts "ERROR: Exception #{e.class} raised: #{e.message}"
 # e.backtrace.each {|t| puts " - #{t}"}
-          raise if reraise
+          raise unless root_msg
           msg.close
           return {
             command: {status: -1},
@@ -285,7 +302,7 @@ module Libis
               }
             end
           end
-          return nil
+          nil
         end
 
         def read_header(headers_file)

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.2.5'
+    VERSION = '1.2.7'
   end
 end

data/libis-format.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
   spec.add_runtime_dependency 'naturally', '~> 2.1'
   spec.add_runtime_dependency 'pdfinfo', '~> 1.4'
-  spec.add_runtime_dependency 'ruby-msg-nx'
+  spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
   spec.add_runtime_dependency 'new_rfc_2047'
   spec.add_runtime_dependency 'pdfkit'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -179,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: ruby-msg-nx
+  name: libis-mapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: new_rfc_2047
   requirement: !ruby/object:Gem::Requirement