mailcvt 0.2.25 → 0.2.26

data/lib/encoded_word.rb

@@ -15,7 +15,10 @@ class EncodedWord
         Dir.glob(File.join(@inputdir, File.join('**', '*.mlog'))).select do |f|
             puts f
             File.open(f + '.plain', 'w') do |out|
-            File.open(f, :internal_encoding => 'utf-8').each_line do |line|
+            input = File.open(f)
+            @input_enc = input.external_encoding
+            input.each_line do |line|
+            #File.open(f, :internal_encoding => 'utf-8').each_line do |line|
                 parts = mysplit(line)
                 newparts = []
                 newparts << format_date(parts[0]) #date
@@ -60,12 +63,14 @@ class EncodedWord
 
     def decode_subject(sub)
         return '' unless sub and sub.length > 0
+        sub = sub.encode('utf-8', @input_enc, :undef=>:replace, :invalid=>:replace)
         one = sub.gsub("\a", '')
         mime_decode(one)
     end
 
     def trim_emails(emails)
         return '' unless emails and emails.length > 0
+        emails = emails.encode('utf-8', @input_enc, :undef=>:replace, :invalid=>:replace)
         pos1 = -1
         newparts = []
         while true do
@@ -96,6 +101,7 @@ class EncodedWord
 
     def decode_attachments(attachments)
         return '' unless attachments and attachments.length > 0
+        attachments = attachments.encode('utf-8', @input_enc, :undef=>:replace, :invalid=>:replace)
         parts = mysplit(attachments, "\a")
         newparts = []
         parts.each do |p|

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.25'
+  VERSION = '0.2.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
   prerelease: 
 platform: ruby
 authors: