mailcvt 0.2.0 → 0.2.1

data/lib/grep_mail.rb

@@ -68,7 +68,7 @@ class GrepMail
 
     def tolog
         cols = tocols
-        cols.join("\t")
+        return cols[1], cols.join("\t")
     end
 
     def tocols

data/lib/log_helper.rb

@@ -56,11 +56,21 @@ class LogHelper
     def concatattach(group)
         v = concatval(group)
 
-        pstart = v.index('filename="')
-        pend = v.rindex('"')
+        pstart = v.index('filename=')
+        return '' unless pstart
+        pstart += 9
 
-        return '' if pstart.nil? or pend.nil?
-        v[(pstart+10)..(pend-1)]
+        pend = v.length - 1
+        return '' unless pend >= pstart
+        if v[pstart] == '"'
+            quote2nd = v.rindex('"')
+            if quote2nd and quote2nd > pstart
+                pstart += 1
+                pend = quote2nd - 1
+            end
+        end
+
+        v[pstart..pend]
     end
    
     def concatval(group)

data/lib/mail_cleaner.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 class MailCleaner
     def initialize(output, timestamp)
-        @fh = OutputHelper.new(output, timestamp)
+        @oh = OutputHelper.new(output, timestamp)
     end
 
     def clean
@@ -16,12 +16,12 @@ class MailCleaner
     def cleantocc
         move 'tocc2'
 
-        d = @fh.getdir("dtocc")
+        d = @oh.getdir("dtocc")
         FileUtils.rm_r(d) if Dir.exists?(d)
     end
 
     def removeok
-        fok = @fh.getmout('.fok')
+        fok = @oh.getmout('.fok')
         raise "Can't find #{fok}." unless File.exist?(fok)
 
         File.foreach(fok) do |line|
@@ -35,9 +35,9 @@ class MailCleaner
     end
 
     def move(suffix)
-        f = @fh.getmout(".f#{suffix}")
+        f = @oh.getmout(".f#{suffix}")
         return unless File.exist?(f)
-        d = @fh.getdir("d#{suffix}")
+        d = @oh.getdir("d#{suffix}")
         raise "#{d} exits." if Dir.exist?(d)
 
         Dir.mkdir d
@@ -46,7 +46,7 @@ class MailCleaner
             begin
                 path = line[0..-2]
                 filename = File.basename(path)
-                File.rename path, File.join(d, filename)
+                FileUtils.mv path, File.join(d, filename)
                 hasfile = true
             rescue Exception => e
                 puts "Can't move file [#{path}] to [#{d}]. \nMessage:#{e.message}"

data/lib/mail_parser.rb

@@ -5,51 +5,51 @@ require 'output_helper'
 
 class MailParser
     def initialize(output, timestamp)
-        @fh = OutputHelper.new(output, timestamp)
+        @oh = OutputHelper.new(output, timestamp)
     end
 
     def parse
-        grep = @fh.getmout('.grep')
+        grep = @oh.getmout('.grep')
         raise "Can't find #{grep}." unless File.exist?(grep)
-        mlog = @fh.getmout('.mlog')
+        mlog = @oh.getmout('.mlog')
         raise "#{mlog} exits." if File.exist?(mlog)
-        fok = @fh.getmout('.fok')
+        fok = @oh.getmout('.fok')
         raise "#{fok} exits." if File.exist?(fok)
 
         lines = []
         curfile = nil
-        @fh.output(mlog, fok) do |omlog, ofok|
-            File.foreach(grep) do |line|
-                curfile = @fh.getfile(line) unless curfile
-                next unless curfile
-
-                if line != "--\n" and !line.start_with?(curfile)
-                    convert curfile, lines, omlog, ofok
-
-                    curfile = @fh.getfile(line)
-                    lines = []
-                end
-                lines << line
-            end
+        File.foreach(grep) do |line|
+            curfile = @oh.getfile(line) unless curfile
+            next unless curfile
+
+            if line != "--\n" and !line.start_with?(curfile)
+                convert curfile, lines
 
-            convert curfile, lines, omlog, ofok
+                curfile = @oh.getfile(line)
+                lines = []
+            end
+            lines << line
         end
-        @fh.closetocc
-        @fh.closeothers
+        convert curfile, lines
+        @oh.finishoutput
     end
 
-    def convert(curfile, lines, omlog, ofok)
+    def convert(curfile, lines)
         return if lines.length == 0
 
         gm = GrepMail.new(curfile, lines, 9)
-        mlog = gm.tolog
-        if gm.iscomplete?
-            omlog.puts mlog
-            ofok.puts curfile
-        elsif gm.istocc?
-            @fh.outputtocc(curfile, mlog)
+        msgid, mlog = gm.tolog
+        if msgid and smgid.length > 0 and msgid == @prevmsgid
+            @oh.outputmlog curfile, nil
         else
-            @fh.outputothers(curfile)
+            @prevmsgid = msgid
+            if gm.iscomplete?
+                @oh.outputmlog curfile, mlog
+            elsif gm.istocc?
+                @oh.outputtocc curfile, mlog
+            else
+                @oh.outputothers curfile
+            end
         end
     end
 end

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/output_helper.rb

@@ -4,6 +4,11 @@ class OutputHelper
     def initialize(output, timestamp)
         @output = output
         @timestamp = timestamp
+
+        @mlogcount = 0
+        @duplicount = 0
+        @tocccount = 0
+        @otherscount = 0
     end
 
     def getfile(line)
@@ -20,17 +25,43 @@ class OutputHelper
         dirname = "#{prefix}#{@timestamp}"
         File.join(@output, dirname)
     end
+    
+    def finishoutput
+        @omlog.close if @omlog
+        @ofok.close if @ofok
+
+        @omlogtocc.close if @omlogtocc
+        @oftocc.close if @oftocc
+
+        @ofothers.close if @ofothers
 
-    def output(f1, f2)
-        tmp1 = f1 + '.tmp'
-        tmp2 = f2 + '.tmp'
-        File.open(tmp1, 'w') do |of1|
-            File.open(tmp2, 'w') do |of2|
-                yield of1, of2
-            end
+        totalcount = @mlogcount + @duplicount + @tocccount + @otherscount
+        puts "#{totalcount} mails processsed. log = #{countmsg(@mlogcount)}"
+        puts "  duplicate = #{countmsg(@duplicount)}, tocc = #{countmsg(@tocccount)}, others = #{countmsg(@otherscount)}"
+    end
+
+    def countmsg(count, total)
+        if total == 0
+            "#{count}(-%)"
+        else
+            "#{count}(#{count * 100 / total}%)"
         end
-        File.rename(tmp1, f1)
-        File.rename(tmp2, f2)
+    end
+
+    def outputmlog(mailpath, mlog)
+        unless @omlog
+            mlog = getmout('.mlog')
+            @omlog = File.open(mlog, 'w') 
+            fok = getmout('.fok')
+            @ofok = File.open(fok, 'w') 
+        end
+        if mlog
+            @omlog.puts mlog
+            @mlogcount += 1
+        else
+            @duplicount += 1
+        end
+        @ofok.puts mailpath
     end
 
     def outputtocc(mailpath, mlog)
@@ -41,13 +72,9 @@ class OutputHelper
             @omlogtocc = File.open(mlogtocc, 'w') 
         end
 
-        @oftocc.puts mailpath
         @omlogtocc.puts "#{File.basename(mailpath)}\t#{mlog}"
-    end
-
-    def closetocc
-        @oftocc.close if @oftocc
-        @omlogtocc.close if @omlogtocc
+        @oftocc.puts mailpath
+        @tocccount += 1
     end
 
     def outputothers(mailpath)
@@ -57,10 +84,7 @@ class OutputHelper
         end
 
         @ofothers.puts mailpath
-    end
-
-    def closeothers
-        @ofothers.close if @ofothers
+        @otherscount += 1
     end
 
     def outputtocc2(mailpath)

data/lib/to_cc_parser.rb

@@ -5,19 +5,19 @@ require 'output_helper'
 
 class ToCcParser
     def initialize(output, timestamp)
-        @fh = OutputHelper.new(output, timestamp)
+        @oh = OutputHelper.new(output, timestamp)
     end
 
     def parse
-        grep = @fh.getmout('.grep.tocc')
+        grep = @oh.getmout('.grep.tocc')
         raise "Can't find #{grep}." unless File.exist?(grep)
-        mtocc = @fh.getmout('.mtocc')
+        mtocc = @oh.getmout('.mtocc')
         raise "Can't find #{mtocc}." unless File.exist?(mtocc)
-        mlog = @fh.getmout('.mlog')
+        mlog = @oh.getmout('.mlog')
         raise "Can't find #{mlog}." unless File.exist?(mlog)
         
         parsetocc grep
-        @fh.closetocc2
+        @oh.closetocc2
 
         File.open(mlog, 'a') do |omlog|
             File.foreach(mtocc) do |line|
@@ -48,11 +48,11 @@ class ToCcParser
         lines = []
         curfile = nil
         File.foreach(grep) do |line|
-            curfile = @fh.getfile(line) unless curfile
+            curfile = @oh.getfile(line) unless curfile
             if line != "--\n" and !line.start_with?(curfile)
                 convert curfile, lines
 
-                curfile = @fh.getfile(line)
+                curfile = @oh.getfile(line)
                 lines = []
             end
             lines << line
@@ -67,7 +67,7 @@ class ToCcParser
         gm = GrepMail.new(curfile, lines, 300)
         cols = gm.tocols
         if gm.istocc?
-            @fh.outputtocc2(curfile)
+            @oh.outputtocc2(curfile)
         else
             key = File.basename(curfile)
             @toccs[key] = cols unless @toccs.has_key?(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 422392363216308818
+      hash: 1727808477597720220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 422392363216308818
+      hash: 1727808477597720220
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25