src/strip.vala

src/strip.vala.c

diff --git a/src/strip.vala b/src/strip.vala
index ce5e7a5..0adfa93 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -865,6 +865,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"
@@ -874,36 +875,36 @@ 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() );                                   
+                       GLib.debug("Checking directory %s is older than max: %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 year: %d/%d/%d", subpath, oldest.get_year() , oldest.get_month(), 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 min: %d/%d/%d", subpath, newest.get_year() , newest.get_month(), newest.get_day_of_month() );                                   
+                       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 min year: %d", subpath, 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 > newest.get_month()) {
-                               GLib.debug("Skip directory %s is newer than min year: %d/%d", subpath, newest.get_year() , newest.get_month() );
+                       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 == 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() );          
+               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;
                        }