mailcvt 0.1.43 → 0.1.44

data/bin/runmailcvt

@@ -43,8 +43,8 @@ fi
 copyonly1 $maildir
 allmail=$maildir/*
 grepexp="^Date: |^Message-ID: |^Subject: |^From: |^To: |^Cc: |^Content-Disposition: attachment;"
-echo "[$(now)] grep -E -A9 \"$grepexp\" $allmail > $grepout"
-grep -E -A9 "$grepexp" $allmail > $grepout 
+echo "[$(now)] grep -i -E -A9 \"$grepexp\" $allmail > $grepout"
+grep -i -E -A9 "$grepexp" $allmail > $grepout 
 
 bindir=$(cd $(dirname $0) && pwd)
 rubydir=$(cd $(dirname $(dirname $(dirname $bindir))) && pwd)
@@ -60,8 +60,8 @@ dtocc="$dailydir/dtocc$timestamp"
 if [ -d $dtocc ]; then
     copyonly1 $dtocc
     alldtocc="$dtocc/*"
-    echo "[$(now)] grep -E -A500 \"^To: |^Cc: \" $alldtocc > $grepout.tocc"
-    grep -E -A500 "^To: |^Cc: " $alldtocc > "$grepout.tocc"
+    echo "[$(now)] grep -i -E -A300 \"^To: |^Cc: \" $alldtocc > $grepout.tocc"
+    grep -i -E -A300 "^To: |^Cc: " $alldtocc > "$grepout.tocc"
 
     echo "[$(now)] mailcvt parsetocc $dailydir $timestamp"
     mailcvt parsetocc $dailydir $timestamp
@@ -70,13 +70,5 @@ if [ -d $dtocc ]; then
     mailcvt cleantocc $dailydir $timestamp
 fi
 
-echo "[$(now)] update reject size."
-recipient=/etc/postfix/recipient_access
-size=$({ du -sh $maildir; du -sh $dailydir; } | sed "s/\t.*$//g" | tr '\n' ' ')
-cursec=$(date +"%m%d%H%M%S")
-sed -i "s/REJECT\t.*$/REJECT\t$size$cursec/g" $recipient
-postmap $recipient
-
-
 echo "[$(now)] runmailcvt finished."
 echo "-------------------------------------------------------------------------------"

data/bin/updatesize

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e 
+maildir=$(cd $1 && pwd)
+dailydir=$(cd $2 && pwd)/$(date +"%Y%m%d")
+
+recipient=/etc/postfix/recipient_access
+size=$({ du -sh $maildir; du -sh $dailydir; } | sed "s/\t.*$//g" | tr '\n' ' ')
+cursec=$(date +"%m%d%H%M%S")
+sed -i "s/REJECT\t.*$/REJECT\t$size$cursec/g" $recipient
+postmap $recipient
+postfix reload

data/lib/grep_mail.rb

@@ -4,9 +4,9 @@ require 'log_helper'
 
 class GrepMail
     def initialize(file, lines, maxval)
+        @maxval = maxval
         @pcontent= file.length + 1
         grouplines(lines)
-        @maxval = maxval
     end
 
     def grouplines(lines)
@@ -43,7 +43,7 @@ class GrepMail
     end
 
     def keyvalue(line)
-        if line[@pcontent] == 'C' and line[@pcontent] == 'o'
+        if is_content_key?(@pcontent)
             dlm = ';' 
         else
             dlm = ':'
@@ -54,15 +54,26 @@ class GrepMail
         return line[@pcontent..pos], line[(pos+2)..-2]
     end
 
+    def is_content_key?(line, start)
+        return false unless line and line.length > start + 1
+        return false unless line[start].upcase == 'C' and line[start+1].downcase == 'o'
+        true
+    end
+
     def valueonly(line)
         cap = line[@pcontent]
         return nil if cap != ' ' and cap != "\t"
-        line[(@pcontent+1)..-2].strip
+        line[(@pcontent+1)..-2]
     end
 
     def tolog
+        cols = tocols
+        cols.join("\t")
+    end
+
+    def tocols
         lh = LogHelper.new(@groups)
-        mlog = lh.tolog
+        cols = lh.tocols
 
         toccok = lh.tocc_complete?
         othersok = lh.others_complete?
@@ -73,7 +84,7 @@ class GrepMail
         elsif othersok
             @istocc = true
         end
-        mlog
+        cols
     end
 
     def iscomplete?

data/lib/log_helper.rb

@@ -22,16 +22,18 @@ class LogHelper
         @valends[0] && @valends[1] && @valends[2] && @valends[3] && @valends[6]
     end
 
-    def tolog
+    def tocols
         @valends = Array.new(7, true)
         cols = Array.new(6)
 
         @groups.each do |g|
-            next if g[:key].nil? or g[:key].length < 2
-            cap = g[:key][0]
+            key = g[:key]
+            next unless key and key.length > 1 
+
+            cap = key[0].upcase
             next unless @@ids.has_key?(cap)
 
-            if cap == 'C' and g[:key][1] == 'o'
+            if cap == 'C' and key[1].downcase == 'o'
                 cols << concatattach(g)
                 @valends[-1] &= isvalend?(g)
             else
@@ -42,7 +44,7 @@ class LogHelper
             end
         end
 
-        cols.join("\t")
+        cols
     end
 
     def isvalend?(group)

data/lib/mail_parser.rb

@@ -21,6 +21,8 @@ class MailParser
         @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
 

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.1.43'
+  VERSION = '0.1.44'
 end

data/lib/output_helper.rb

@@ -8,7 +8,7 @@ class OutputHelper
 
     def getfile(line)
         pos = line.index(':')
-        return "" if pos.nil?
+        return nil unless pos
         line[0..(pos-1)]
     end
 
@@ -42,7 +42,7 @@ class OutputHelper
         end
 
         @oftocc.puts mailpath
-        @omlogtocc.puts "#{mailpath}\t#{mlog}"
+        @omlogtocc.puts "#{File.basename(mailpath)}\t#{mlog}"
     end
 
     def closetocc

data/lib/setup_mailcvt.rb

@@ -16,7 +16,7 @@ class SetupMailcvt
         File.delete jobfile if File.exist?(jobfile)
 
         newmaildir = File.join(Dir.home, 'Maildir/new')
-        File.open(jobfile, 'w') { |f| f.puts "* * * * * #{get_run_path} #{newmaildir} #{@output}" }
+        File.open(jobfile, 'w') { |f| f.puts "5 * * * * #{get_run_path} #{newmaildir} #{@output}" }
         `crontab #{jobfile}`
         File.delete jobfile
     end

data/lib/to_cc_parser.rb

@@ -21,23 +21,28 @@ class ToCcParser
 
         File.open(mlog, 'a') do |omlog|
             File.foreach(mtocc) do |line|
-                oldlog = line[0..-2]
+                cols = splitmlog(line)
+                next unless cols
 
-                next unless oldlog
-                parts = oldlog.split("\t")
-                next if parts.nil? or parts.length < 7 
-
-                fn = parts[0]
+                fn = cols[0]
                 if @toccs.has_key?(fn)
                     tocc = @toccs[fn]
-                    parts[4+1] = tocc[4]
-                    parts[5+1] = tocc[5]
+                    cols[4+1] = tocc[4]
+                    cols[5+1] = tocc[5]
                 end
-                omlog.puts parts[1..-1].join("\t")
+                omlog.puts cols[1..-1].join("\t")
             end
         end
     end
 
+    def splitmlog(linehasn, colcount = 7)
+        return nil unless linehasn and linehasn.length >= colcount
+        cols = linehasn.split("\t")
+        return nil if cols.length < colcount
+        cols[-1] = cols[-1][0..-2]
+        cols
+    end
+
     def parsetocc(grep)
         @toccs = {}
         lines = []
@@ -59,12 +64,13 @@ class ToCcParser
     def convert(curfile, lines)
         return if lines.length == 0
 
-        gm = GrepMail.new(curfile, lines, 500)
-        mlog = gm.tolog
+        gm = GrepMail.new(curfile, lines, 300)
+        cols = gm.tocols
         if gm.istocc?
             @fh.outputtocc2(curfile)
         else
-            @toccs[curfile] = mlog unless @toccs.has_key?(curfile)
+            key = File.basename(curfile)
+            @toccs[key] = cols unless @toccs.has_key?(key)
         end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.44
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,20 +84,20 @@ extra_rdoc_files:
 - README.rdoc
 - mailcvt.rdoc
 files:
-- bin/mailcvt
 - bin/lock-runmailcvt
+- bin/mailcvt
 - bin/runmailcvt
-- lib/mailcvt/version.rb
-- lib/mailcvt.rb
+- bin/updatesize
 - lib/big_mail_generator.rb
-- lib/mail_parser.rb
-- lib/line_converter.rb
 - lib/grep_mail.rb
 - lib/log_helper.rb
+- lib/mail_cleaner.rb
+- lib/mail_parser.rb
+- lib/mailcvt.rb
 - lib/output_helper.rb
 - lib/setup_mailcvt.rb
-- lib/mail_cleaner.rb
 - lib/to_cc_parser.rb
+- lib/mailcvt/version.rb
 - README.rdoc
 - mailcvt.rdoc
 homepage: http://github.com/ryu-kahou/mailcvt
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2352089024322406467
+      hash: -4130757654178801639
 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: 2352089024322406467
+      hash: -4130757654178801639
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/line_converter.rb

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-class LineConverter
-    @@hkeys = { 
-        'D' => {key: 'Date:', begin: 5, id: 0}, 
-        'M' => {key: 'Message-ID:', begin: 11, id: 1},
-        'S' => {key: 'Subject:', begin: 8, id: 2},
-        'F' => {key: 'From:', begin: 5, id: 3},
-        'T' => {key: 'To:', begin: 3, id: 4}
-    }
-    ATTACH = 'Content-Disposition: attachment; filename="'
-    
-    def initialize
-        @hvals = Array.new(5, "")
-        @attach = ""
-    end
-
-    def log
-       line = "" 
-       @hvals.each {|v| line << "#{v}\t"}
-       line << @attach
-    end
-
-    def convert(line)
-        cap = line[0]
-        if not @hfinished
-            convertheader(cap, line) 
-        else
-            convertbody(cap, line)
-        end
-    end
-
-    def convertheader(cap, line)
-        if cap == nil or cap == "\n" or cap == ''
-            @hfinished = true 
-            return
-        end
-
-        if cap == "\t" or cap == ' '
-            @hvals[@hk[:id]] += "\a#{line.strip}" if @hk
-        else
-            if @@hkeys.has_key?(cap)
-                @hk = @@hkeys[cap]
-                @hvals[@hk[:id]] = line[@hk[:begin]..-1].strip if line.start_with?(@hk[:key])
-            else
-                @hk = nil
-            end
-        end
-    end
-
-    def convertbody(cap, line)
-        if cap == 'C' and line.start_with?(ATTACH)
-            @attach << "\a" if not @attach.empty?
-            @attach << line[43..-3] # filename"\n
-        end
-    end
-end
-