mailcvt 0.2.9 → 0.2.10

data/bin/runmailcvt

@@ -27,8 +27,9 @@ dailydir=$(cd $2 && pwd)/$(date +"%Y%m%d")
 
 echo "[$(now)] runmailcvt started."
 wdir=$(pwd)
-isize=$(du -h $maildir)
-echo "[$(now)] working dir = $wdir, input = $isize, output = $dailydir"
+isize=$(du -h $maildir | sed "s/\t.*$//g")
+icount=$(find $maildir -type f -print | wc -l)
+echo "[$(now)] working dir = $wdir, input = $maildir($isize, $icount), output = $dailydir"
 
 if [ ! -d $dailydir ]; then
     echo "[$(now)] create daily output directory $dailydir"
@@ -42,8 +43,8 @@ fi
 
 copyonly1 $maildir
 grepexp="^Date: |^Message-ID: |^Subject: |^From: |^To: |^Cc: |^Content-Disposition: attachment;"
-echo "[$(now)] find $maildir | xargs grep -i -E -A9 \"$grepexp\" > $grepout"
-find $maildir | xargs grep -i -E -A9 "$grepexp" > $grepout 
+echo "[$(now)] find $maildir -type f -print0 | xargs -0 grep -i -E -A9 \"$grepexp\" > $grepout"
+find $maildir -type f -print0 | xargs -0 grep -i -E -A9 "$grepexp" > $grepout 
 
 bindir=$(cd $(dirname $0) && pwd)
 rubydir=$(cd $(dirname $(dirname $(dirname $bindir))) && pwd)
@@ -58,8 +59,8 @@ mailcvt clean $dailydir $timestamp
 dtocc="$dailydir/dtocc$timestamp"
 if [ -d $dtocc ]; then
     copyonly1 $dtocc
-    echo "[$(now)] find $dtocc | xargs grep -i -E -A300 \"^To: |^Cc: \" > $grepout.tocc"
-    find $dtocc | xargs grep -i -E -A300 "^To: |^Cc: " > "$grepout.tocc"
+    echo "[$(now)] find $dtocc -type f -print0 | xargs -0 grep -i -E -A300 \"^To: |^Cc: \" > $grepout.tocc"
+    find $dtocc -type f -print0 | xargs -0 grep -i -E -A300 "^To: |^Cc: " > "$grepout.tocc"
 
     echo "[$(now)] mailcvt parsetocc $dailydir $timestamp"
     mailcvt parsetocc $dailydir $timestamp

data/lib/base_parser.rb

@@ -50,7 +50,12 @@ class BaseParser
             end
             lines << line
         end
-        convert curfile, lines
+        if curfile and lines.length > 0
+            convert curfile, lines
+        else
+            puts "$grep is empty or malformated."
+        end
+
     end
 
     def convert(curfile, lines)

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4318484599299501152
+      hash: 2519518715147880699
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4318484599299501152
+      hash: 2519518715147880699
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25