src/strip.vala
[app.mailtrimmer] / src / strip.vala
index ed7fee2..773a91b 100644 (file)
@@ -1,5 +1,13 @@
 /**
 
+ ** check left to do:  
+  - range scans on maildir
+  - see how replacing the links works in the resulting email via thunderbird etc..
+  - some checksum issues (see dupelicates?? suspect 0byte issues?)  -- seems ok now?
+
+
+
   needs to scan 2 things
   a) our mailfort email database
        point it at the top directory, containing YEAR/MONTH/DAY.... directories.
@@ -362,7 +370,7 @@ public class Strip : GLib.Object {
        
        // initialize it with known data..
        // that should wipe out dupes.
-       var filesize = this.query("SELECT filesize FROM Attachment WHERE id = %d".printf(
+       var filesize = this.execute("SELECT filesize FROM Attachment WHERE id = %d".printf(
                        int.parse(sid)));       
                if (int.parse(filesize) < 1) {
                GLib.debug("Could not get filesize from id :%s = %s", sid,filesize);
@@ -549,7 +557,10 @@ public class Strip : GLib.Object {
                        }
                        GLib.debug("Creating file %s", target_fn);
                        if (!FileUtils.test (target_fn, FileTest.EXISTS)) {
-                               Posix.link(fn, target_fn);
+                               var from = File.new_for_path (fn);
+                               var to =  File.new_for_path (target_fn);
+                               from.copy(to, 0, null);
+
                        }
                } else { 
                        GLib.debug("Skipping extraction %s", target_fn);
@@ -597,7 +608,7 @@ public class Strip : GLib.Object {
                
                }
                if (!need_return) {
-                       return "";
+                       return got_row ? "" : ret;
                }
                if (!got_row) {
                         GLib.debug("ERROR : no rows returned");
@@ -661,15 +672,15 @@ public class Strip : GLib.Object {
                        oldest = oldest.add_months(-1 * StripApplication.opt_age_oldest);
                        var tspan = mailtime.difference(oldest) / GLib.TimeSpan.DAY;
 
-                       if (tspan > 0) {
+                       if (tspan < 0) {
                                GLib.debug("skip file is %d days older than %d months", (int)tspan, StripApplication.opt_age_oldest);
                                return;
                        }
                        
                        var newest = new  DateTime.now_local();
-                       newest = oldest.add_months(-1 * StripApplication.opt_age_newest);
+                       newest = newest.add_months(-1 * StripApplication.opt_age_newest);
                        tspan = mailtime.difference(newest) / GLib.TimeSpan.DAY;
-                       if (tspan < 0) {
+                       if (tspan > 0) {
                                GLib.debug("skip file is %d days newer than %d months", (int)tspan, StripApplication.opt_age_newest);
                                return;
                        }
@@ -752,16 +763,16 @@ public class Strip : GLib.Object {
                
                var oldest = new  DateTime.now_local();
                oldest = oldest.add_months(-1 * StripApplication.opt_age_oldest);
-               var rtspan = oldest.difference(oldest) / GLib.TimeSpan.DAY;
-
-               if (rtspan > 0) {
+               var rtspan = mailtime.difference(oldest) / GLib.TimeSpan.DAY;
+               GLib.debug("Checking oldest %d days difference", (int)rtspan   );
+               if (rtspan < 0) {
                        GLib.debug("skip(2) file is %d days older than %d months", (int)rtspan, StripApplication.opt_age_oldest);
                        return;
                }
                var newest = new  DateTime.now_local();
-               newest = oldest.add_months(-1 * StripApplication.opt_age_newest);
+               newest = newest.add_months(-1 * StripApplication.opt_age_newest);
                rtspan = mailtime.difference(newest) / GLib.TimeSpan.DAY;
-               if (rtspan < 0) {
+               if (rtspan > 0) {
                        GLib.debug("skip(2) file is %d days newer than %d months : %s", (int)rtspan, StripApplication.opt_age_newest,
                                mailtime.format("%Y-%m-%d %H:%M:%S"));
                        return;
@@ -834,6 +845,7 @@ public class Strip : GLib.Object {
         GLib.debug("finished writing output %d", file_size);
 
         //
+        outstream = null;
         
          
        this.used_space_after += file_size;
@@ -842,12 +854,17 @@ public class Strip : GLib.Object {
        if (StripApplication.opt_is_replacing) {
                Posix.unlink(path +"/" + name);         
                GLib.debug("copy tmp file %s to %s" , tmpfile, path +"/" + name);               
-               Posix.link(tmpfile, path +"/" + name);
-               Posix.unlink(tmpfile);
-               var nf = File.new_for_path(path +"/" + name);
+               
+               // link will not work, as we are doing it accross file systems
+                       var from = File.new_for_path (tmpfile);
+                       var nf =  File.new_for_path (path +"/" + name);
+                       from.copy(nf, 0, null);
+                       
+
                var newfileinfo = nf.query_info(GLib.FileAttribute.TIME_MODIFIED,GLib.FileQueryInfoFlags.NONE,null);
                newfileinfo.set_modification_time(mod_time);
                nf.set_attributes_from_info(newfileinfo,FileQueryInfoFlags.NONE);
+               Posix.unlink(tmpfile);
                }
        this.processed++;
        
@@ -865,6 +882,7 @@ public class Strip : GLib.Object {
     public void scan_dir(string basepath, string subpath)
     {
         
+        
         // determine if path is to old to scan..
         if (subpath.length > 0 && StripApplication.opt_scan_mailfort) {
                        var year =  int.parse(subpath.substring(1,4));  // "/2000"
@@ -873,15 +891,37 @@ public class Strip : GLib.Object {
                
                var oldest = new  DateTime.now_local();
                        oldest = oldest.add_months(-1 * StripApplication.opt_age_oldest);
+                       
+                       //GLib.debug("Checking directory %s is older than min: %d/%d/%d", subpath, oldest.get_year() , oldest.get_month(), oldest.get_day_of_month() );                                 
+                       
                        if (year < oldest.get_year()) {
                                GLib.debug("Skip directory %s is older than min year: %d", subpath, oldest.get_year());
                                return;
                        }
                        if (year == oldest.get_year() &&  month < oldest.get_month()) {
-                               GLib.debug("Skip directory %s is older than min year: %d/%d", subpath, oldest.get_year() , oldest.get_month() );
+                               GLib.debug("Skip directory %s is older than min month: %d/%d", subpath, oldest.get_year() , oldest.get_month() );
+                               return;
+                       }
+               if (year == oldest.get_year() &&  month == oldest.get_month() && day < oldest.get_day_of_month()) {
+                               GLib.debug("Skip directory %s is older than min day: %d/%d/%d", subpath, oldest.get_year() , oldest.get_month(), oldest.get_day_of_month() );           
+                               return;
+                       }
+               
+               var newest = new  DateTime.now_local();
+                       newest = newest.add_months(-1 * StripApplication.opt_age_newest);
+                       
+                       //GLib.debug("Checking directory %s is newer than max: %d/%d/%d", subpath, newest.get_year() , newest.get_month(), newest.get_day_of_month() );                                 
+                       
+                       if (year > newest.get_year()) {
+                               GLib.debug("Skip directory %s is newer than max year: %d", subpath, newest.get_year());
+                               return;
+                       }
+                       if (year == newest.get_year() &&  month != 999 && month > newest.get_month()) {
+                               GLib.debug("Skip directory %s is newer than max month: %d/%d", subpath, newest.get_year() , newest.get_month() );
                                return;
                        }
-               if (year == oldest.get_year() &&  month == oldest.get_month() && day < oldest.get_day()) {
+               if (year == newest.get_year() &&  month == newest.get_month() &&  day != 999 && day > newest.get_day_of_month()) {
+                               GLib.debug("Skip directory %s is newer than max day: %d/%d/%d", subpath, newest.get_year() , newest.get_month(), newest.get_day_of_month() );           
                                return;
                        }