src/strip.vala

[app.mailtrimmer] / src / strip.vala

diff --git a/src/strip.vala b/src/strip.vala
index 60f7a70..470514a 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -87,7 +87,9 @@ public class StripApplication : GLib.Application {
        public static string? opt_db_name = null;       
        public static string? opt_db_user = null;               
        public static string? opt_db_pass = null;               
-
+       public static string? opt_scan_mailfort_only = "";              
+       
+       
        public static int    opt_limit = -1;
 
        public static int    opt_age_newest = 1;
@@ -131,7 +133,8 @@ public class StripApplication : GLib.Application {
                { "oldest", 0, 0, OptionArg.INT, ref opt_age_oldest, "do not replace messages older than X (default is 6 months)", null },
 
                { "scan-maildir", 0, 0, OptionArg.NONE, ref opt_scan_maildir, "scan an maildir tree", null },
-               { "scan-mailfort", 0, 0, OptionArg.NONE, ref opt_scan_mailfort, "scan a mailfort tree", null },  
+               { "scan-mailfort", 0, 0, OptionArg.NONE, ref opt_scan_mailfort, "scan a mailfort tree", null }, 
+               { "scan-mailfort-only", 0, 0, OptionArg.STRING, ref opt_scan_mailfort_only, "scan a mailfort Year/month eg. 2010/08", null }, 
                { null }       
        };         
     public StripApplication( string[] args ) 
@@ -238,7 +241,7 @@ public class StripApplication : GLib.Application {
                return 0;
         }
 
-               strip.scan_dir(opt_path, "");
+               strip.scan_dir(opt_path, opt_scan_mailfort_only);
         
 
         
@@ -444,6 +447,13 @@ public class Strip : GLib.Object {
         var filename = attachment.get_header("X-strip-content-name");
         var file_path  = attachment.get_header("X-strip-path");
         var fn =  StripApplication.opt_target_path + "/" + file_path;
+        
+
+               if (!FileUtils.test (fn, FileTest.EXISTS)) {
+                       GLib.debug("SKIP -- file does not exist");
+                       return;
+       }
+        
         var chksum = this.md5_file(fn);
                var mime_type = attachment.get_header("X-strip-content-type");
 
@@ -452,9 +462,6 @@ public class Strip : GLib.Object {
                                                ,GLib.FileQueryInfoFlags.NONE,null);
        var file_size = (int) fileinfo.get_size();
 
-               if (!FileUtils.test (fn, FileTest.EXISTS)) {
-                       GLib.debug("SKIP -- file does not exist");
-               }
       
                this.real_query(-1, """