mailcvt 0.2.1 → 0.2.2

data/lib/base_parser.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+require 'grep_mail'
+require 'output_helper'
+
+class BaseParser
+    def initialize(output, timestamp)
+        @oh = OutputHelper.new(output, timestamp)
+    end
+
+    def shouldexist(*exts)
+        paths = []
+        exts.each do |ext|
+            path = @oh.getmout(ext)
+            raise "Can't find #{path}" unless File.exist?(path)
+            paths << path
+        end
+
+        return paths[0] if paths.length == 1
+        paths
+    end
+
+    def shouldabsent(*exts)
+        exts.each do |ext|
+            path = @oh.getmout(ext)
+            raise "#{path} already exists." if File.exist?(path)
+        end
+    end
+
+    def parse
+        summary = parse_with_summary
+        puts summary
+    end
+
+    def parse_with_summary
+    end
+
+    def parsegrep(grep)
+        lines = []
+        curfile = nil
+        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
+
+                curfile = @oh.getfile(line)
+                lines = []
+            end
+            lines << line
+        end
+        convert curfile, lines
+    end
+
+    def convert(curfile, lines)
+    end
+end

data/lib/grep_mail.rb

@@ -3,16 +3,16 @@
 require 'log_helper'
 
 class GrepMail
-    def initialize(file, lines, maxval)
+    def initialize(file, lines_has_newline, maxval)
         @maxval = maxval
         @pcontent= file.length + 1
-        grouplines(lines)
+        grouplines(lines_has_newline)
     end
 
-    def grouplines(lines)
+    def grouplines(lines_has_newline)
         @groups = []
         valend = false
-        lines.each do |line|
+        lines_has_newline.each do |line|
             dlm = line[@pcontent-1]
             if dlm == ':'
                 finish_multiline_value 
@@ -34,6 +34,8 @@ class GrepMail
                 end
             end
         end
+
+        finish_multiline_value
     end
 
     def finish_multiline_value
@@ -43,7 +45,7 @@ class GrepMail
     end
 
     def keyvalue(line)
-        if is_content_key?(@pcontent)
+        if is_content_key?(line, @pcontent)
             dlm = ';' 
         else
             dlm = ':'

data/lib/mail_cleaner.rb

@@ -44,7 +44,7 @@ class MailCleaner
         hasfile = false
         File.foreach(f) do |line|
             begin
-                path = line[0..-2]
+                path = getpath(line)
                 filename = File.basename(path)
                 FileUtils.mv path, File.join(d, filename)
                 hasfile = true
@@ -55,4 +55,10 @@ class MailCleaner
 
         Dir.rmdir d unless hasfile
     end
+
+    def getpath(line)
+        start = 0
+        start = 1 if line[0] == '#'
+        line[start..-2]
+    end
 end

data/lib/mail_parser.rb

@@ -2,44 +2,23 @@
 
 require 'grep_mail'
 require 'output_helper'
+require 'base_parser'
 
-class MailParser
-    def initialize(output, timestamp)
-        @oh = OutputHelper.new(output, timestamp)
-    end
-
-    def parse
-        grep = @oh.getmout('.grep')
-        raise "Can't find #{grep}." unless File.exist?(grep)
-        mlog = @oh.getmout('.mlog')
-        raise "#{mlog} exits." if File.exist?(mlog)
-        fok = @oh.getmout('.fok')
-        raise "#{fok} exits." if File.exist?(fok)
-
-        lines = []
-        curfile = nil
-        File.foreach(grep) do |line|
-            curfile = @oh.getfile(line) unless curfile
-            next unless curfile
+class MailParser < BaseParser
+    def parse_with_summary
+        grep = shouldexist('.grep')
+        shouldabsent('.mlog', '.fok')
 
-            if line != "--\n" and !line.start_with?(curfile)
-                convert curfile, lines
-
-                curfile = @oh.getfile(line)
-                lines = []
-            end
-            lines << line
-        end
-        convert curfile, lines
+        parsegrep grep
         @oh.finishoutput
     end
 
     def convert(curfile, lines)
-        return if lines.length == 0
+        return unless lines and lines.length > 0
 
         gm = GrepMail.new(curfile, lines, 9)
         msgid, mlog = gm.tolog
-        if msgid and smgid.length > 0 and msgid == @prevmsgid
+        if msgid and msgid.length > 0 and msgid == @prevmsgid
             @oh.outputmlog curfile, nil
         else
             @prevmsgid = msgid

data/lib/mailcvt/version.rb

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

data/lib/output_helper.rb

@@ -35,9 +35,16 @@ class OutputHelper
 
         @ofothers.close if @ofothers
 
+        getsummary
+    end
+
+    def getsummary
         totalcount = @mlogcount + @duplicount + @tocccount + @otherscount
-        puts "#{totalcount} mails processsed. log = #{countmsg(@mlogcount)}"
-        puts "  duplicate = #{countmsg(@duplicount)}, tocc = #{countmsg(@tocccount)}, others = #{countmsg(@otherscount)}"
+        summary = "#{totalcount} mails processsed. log = #{countmsg(@mlogcount, totalcount)}"
+        summary << "\n  duplicate = #{countmsg(@duplicount, totalcount)}"
+        summary << ", tocc = #{countmsg(@tocccount, totalcount)}"
+        summary << ", others = #{countmsg(@otherscount, totalcount)}"
+        summary
     end
 
     def countmsg(count, total)
@@ -48,23 +55,25 @@ class OutputHelper
         end
     end
 
-    def outputmlog(mailpath, mlog)
+    def outputmlog(mailpath, line)
         unless @omlog
             mlog = getmout('.mlog')
             @omlog = File.open(mlog, 'w') 
             fok = getmout('.fok')
             @ofok = File.open(fok, 'w') 
         end
-        if mlog
-            @omlog.puts mlog
+        if line
+            @omlog.puts line
             @mlogcount += 1
+            @ofok.puts mailpath
         else
             @duplicount += 1
+            @ofok.write '#'
+            @ofok.puts mailpath
         end
-        @ofok.puts mailpath
     end
 
-    def outputtocc(mailpath, mlog)
+    def outputtocc(mailpath, line)
         unless @oftocc
             ftocc = getmout('.ftocc')
             @oftocc = File.open(ftocc, 'w') 
@@ -72,7 +81,7 @@ class OutputHelper
             @omlogtocc = File.open(mlogtocc, 'w') 
         end
 
-        @omlogtocc.puts "#{File.basename(mailpath)}\t#{mlog}"
+        @omlogtocc.puts "#{File.basename(mailpath)}\t#{line}"
         @oftocc.puts mailpath
         @tocccount += 1
     end

data/lib/to_cc_parser.rb

@@ -2,37 +2,47 @@
 
 require 'grep_mail'
 require 'output_helper'
+require 'base_parser'
 
-class ToCcParser
-    def initialize(output, timestamp)
-        @oh = OutputHelper.new(output, timestamp)
-    end
-
-    def parse
-        grep = @oh.getmout('.grep.tocc')
-        raise "Can't find #{grep}." unless File.exist?(grep)
-        mtocc = @oh.getmout('.mtocc')
-        raise "Can't find #{mtocc}." unless File.exist?(mtocc)
-        mlog = @oh.getmout('.mlog')
-        raise "Can't find #{mlog}." unless File.exist?(mlog)
+class ToCcParser < BaseParser
+    def parse_with_summary
+        grep, mtocc = shouldexist('.grep.tocc', '.mtocc')
         
         parsetocc grep
-        @oh.closetocc2
+        replace_tocc mtocc
+    end
 
+    def replace_tocc(mtocc)
+        inputcount = 0
+        replacecount = 0 
+        outputcount = 0 
+        mlog = @oh.getmout('.mlog')
         File.open(mlog, 'a') do |omlog|
             File.foreach(mtocc) do |line|
+                inputcount += 1
                 cols = splitmlog(line)
                 next unless cols
 
                 fn = cols[0]
                 if @toccs.has_key?(fn)
+                    replacecount += 1
                     tocc = @toccs[fn]
                     cols[4+1] = tocc[4]
                     cols[5+1] = tocc[5]
                 end
+                outputcount += 1
                 omlog.puts cols[1..-1].join("\t")
             end
         end
+
+        msg = "#{formatcount(replacecount, inputcount)} replaced. "
+        msg << "#{formatcount(outputcount - replacecount, inputcount)} output without change. "
+        msg << "#{formatcount(inputcount - outputcount , inputcount)} ignored. "
+        msg << "Totally #{inputcount} row#{inputcount > 1 ? 's' : ''} from .mtocc file."
+    end
+
+    def formatcount(part, total)
+        "#{part}(#{total == 0 ? '-' : part * 100 / total}%) row#{part > 1 ? 's' : ''}"
     end
 
     def splitmlog(linehasn, colcount = 7)
@@ -45,24 +55,12 @@ class ToCcParser
 
     def parsetocc(grep)
         @toccs = {}
-        lines = []
-        curfile = nil
-        File.foreach(grep) do |line|
-            curfile = @oh.getfile(line) unless curfile
-            if line != "--\n" and !line.start_with?(curfile)
-                convert curfile, lines
-
-                curfile = @oh.getfile(line)
-                lines = []
-            end
-            lines << line
-        end
-
-        convert curfile, lines
+        parsegrep grep
+        @oh.closetocc2
     end
 
     def convert(curfile, lines)
-        return if lines.length == 0
+        return unless lines and lines.length > 0
 
         gm = GrepMail.new(curfile, lines, 300)
         cols = gm.tocols

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,16 +88,17 @@ files:
 - bin/mailcvt
 - bin/runmailcvt
 - bin/updatesize
+- lib/base_parser.rb
 - lib/big_mail_generator.rb
 - lib/grep_mail.rb
 - lib/log_helper.rb
 - lib/mail_cleaner.rb
 - lib/mail_parser.rb
+- lib/mailcvt/version.rb
 - lib/mailcvt.rb
 - lib/output_helper.rb
 - lib/setup_mailcvt.rb
 - lib/to_cc_parser.rb
-- lib/mailcvt/version.rb
 - README.rdoc
 - mailcvt.rdoc
 homepage: http://github.com/ryu-kahou/mailcvt
@@ -120,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1727808477597720220
+      hash: -1276762649925627637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1727808477597720220
+      hash: -1276762649925627637
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25