mailcvt 0.2.26 → 0.2.27

data/lib/encoded_word.rb

@@ -15,21 +15,21 @@ class EncodedWord
         Dir.glob(File.join(@inputdir, File.join('**', '*.mlog'))).select do |f|
             puts f
             File.open(f + '.plain', 'w') do |out|
-            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
-                newparts << parts[1] #message-id
-                newparts << decode_subject(parts[2]) #subject
-                newparts << trim_emails(parts[3]) #from
-                newparts << trim_emails(parts[4]) #to
-                newparts << trim_emails(parts[5]) #cc
-                newparts << decode_attachments(parts[6]) unless parts.length == 6 #attachment
-                out.puts newparts.join("\t")
-            end
+                File.open(f) do |input|
+                    @input_enc = input.external_encoding
+                    input.each_line do |line|
+                        parts = mysplit(line)
+                        newparts = []
+                        newparts << format_date(parts[0]) #date
+                        newparts << parts[1] #message-id
+                        newparts << decode_subject(parts[2]) #subject
+                        newparts << trim_emails(parts[3]) #from
+                        newparts << trim_emails(parts[4]) #to
+                        newparts << trim_emails(parts[5]) #cc
+                        newparts << decode_attachments(parts[6]) unless parts.length == 6 #attachment
+                        out.puts newparts.join("\t")
+                    end
+                end
             end
         end
     end
@@ -112,13 +112,17 @@ class EncodedWord
 
     def mime_decode(input, out_charset = 'utf-8')
         return '' unless input and input.length > 0
-        ret = input.sub!(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/) {
-            charset = $1
-            enc = $2.upcase
-            word = $3
-            word = word.unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
-            word.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
-        }
-        return ret ? mime_decode(input) : input
+        begin
+            ret = input.sub!(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/) {
+                charset = $1
+                enc = $2.upcase
+                word = $3
+                word = word.unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
+                word.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
+            }
+            return ret ? mime_decode(input) : input
+        rescue
+            return input
+        end
    end
 end

data/lib/mailcvt/version.rb

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

metadata

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