src/strip.vala

[app.mailtrimmer] / src / strip.vala

diff --git a/src/strip.vala b/src/strip.vala
index bcc2fca..31a07d2 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;
@@ -100,6 +102,7 @@ public class StripApplication : GLib.Application {
        public static bool      opt_scan_mailfort  = false;     
        public static bool              opt_dump = false;       
        public static bool              opt_debug = false; 
+       public static bool              opt_stamp = false; 
        
        public static bool opt_debug_sql = false;       
        public static string? opt_replace_link = null;
@@ -131,7 +134,9 @@ 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 },  
+               { "stamp", 0, 0, OptionArg.NONE, ref opt_stamp, "create and honour directory stamps - flag that a folder has been scanned already", 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 +243,7 @@ public class StripApplication : GLib.Application {
                return 0;
         }
 
-               strip.scan_dir(opt_path, "");
+               strip.scan_dir(opt_path, opt_scan_mailfort_only);
         
 
         
@@ -370,11 +375,11 @@ public class Strip : GLib.Object {
        
        // initialize it with known data..
        // that should wipe out dupes.
-       var matches = this.execute("SELECT id   FROM Attachment WHERE id = %d".printf(
+       var matches = this.query("SELECT count(id)   FROM Attachment WHERE id = %d".printf(
                        int.parse(sid)));  
 
                 
-               if (matches == "") {     
+               if (matches == "0") {    
                        // our old mailfort code deleted the crap out of old records...
                        // if this occurs we will need to create the record again..
                        this.fix_deleted_attachment_db(int.parse(sid),attachment);
@@ -385,7 +390,7 @@ public class Strip : GLib.Object {
        
        // initialize it with known data..
        // that should wipe out dupes.
-       var filesize = this.execute("SELECT filesize FROM Attachment WHERE id = %d".printf(
+       var filesize = this.query("SELECT filesize FROM Attachment WHERE id = %d".printf(
                        int.parse(sid)));  
 
                if (filesize=="") {      
@@ -444,6 +449,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 +464,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, """
                       
@@ -580,7 +589,7 @@ public class Strip : GLib.Object {
           """.printf(
                        this.mysql_escape(this.active_message_exim_id),
                        chksum,
-                       this.mysql_escape( attachment.get_filename() ), // what is thsi is invalid?
+                       this.mysql_escape( GLib.Uri.escape_string(attachment.get_filename(),"", false) ), // what is thsi is invalid?
                         file_size)
                );
                 
@@ -624,10 +633,10 @@ public class Strip : GLib.Object {
                var target_fn = "";
 
            if (StripApplication.opt_is_extracting) {
-                       target_fn = StripApplication.opt_target_path + "/" + this.created_dir +"/"+ file_id  + "-" + filename;
+                       target_fn = StripApplication.opt_target_path + "/" + this.created_dir +"/"+ file_id  + "-" + GLib.Uri.escape_string(filename,"", false);
                } 
                    
-           var stored =  "/" + this.created_dir +"/"+ file_id  + "-" + filename;
+           var stored =  "/" + this.created_dir +"/"+ file_id  + "-" + GLib.Uri.escape_string(filename,"", false);
                 this.query("""
                
                        SELECT attachment_update_store(
@@ -646,15 +655,15 @@ public class Strip : GLib.Object {
         rep.set_filename(filename);
         string txt = "<html><body>"+
             "<a href=\"" + StripApplication.opt_replace_link + "/" +
-                       file_id + "/" + this.created_dir + "/"+chksum+"/"+ GLib.Uri.escape_string( filename) +"\">" + 
-            GLib.Uri.escape_string( filename) + // fixme needs html escaping...
+                       file_id + "/" + this.created_dir + "/"+chksum+"/"+ GLib.Uri.escape_string( filename, "", false) +"\">" + 
+            GLib.Uri.escape_string( filename, "", false) + // fixme needs html escaping...
             "</a>" +
             "</body></html>";
 
         rep.get_content_type().set_parameter("charset", "utf-8");
                rep.set_header("X-strip-id", file_id);
                rep.set_header("X-strip-content-name",  filename);                              
-               rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" + filename);              
+               rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" +  GLib.Uri.escape_string(filename,"", false));           
                rep.set_header("X-strip-content-type", mime_type);              
         var stream =  new GMime.StreamMem.with_buffer(txt.data);
         var con = new GMime.DataWrapper.with_stream(stream,GMime.ContentEncoding.DEFAULT);