src/strip.vala

[app.mailtrimmer] / src / strip.vala

diff --git a/src/strip.vala b/src/strip.vala
index 24b26c2..773a91b 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -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");
@@ -752,8 +763,8 @@ 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;
-
+               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;
@@ -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++;