src/strip.vala

[app.mailtrimmer] / src / strip.vala

diff --git a/src/strip.vala b/src/strip.vala
index 6cc604f..a4c5a69 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -667,9 +667,9 @@ public class Strip : GLib.Object {
                        }
                        
                        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;
                        }
@@ -759,7 +759,7 @@ public class Strip : GLib.Object {
                        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) {
                        GLib.debug("skip(2) file is %d days newer than %d months : %s", (int)rtspan, StripApplication.opt_age_newest,
@@ -889,6 +889,25 @@ public class Strip : GLib.Object {
                                return;
                        }
                 
+               var newest = new  DateTime.now_local();
+                       newest = newest.add_months(-1 * StripApplication.opt_age_newest);
+                       
+                       GLib.debug("Checking directory %s is newer than min: %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 min year: %d", subpath, newest.get_year());
+                               return;
+                       }
+                       if (year == newest.get_year() &&  month < newest.get_month()) {
+                               GLib.debug("Skip directory %s is newer than min year: %d/%d", subpath, newest.get_year() , newest.get_month() );
+                               return;
+                       }
+               if (year == newest.get_year() &&  month == newest.get_month() && day < newest.get_day_of_month()) {
+                               GLib.debug("Skip directory %s is newer than min year: %d/%d/%d", subpath, newest.get_year() , newest.get_month(), newest.get_day_of_month() );          
+                               return;
+                       }
+               
+               
                
         }