expire-8601: wip new version, sort of works, need adj

[chiark-utils.git] / scripts / expire-iso8601.new

diff --git a/scripts/expire-iso8601.new b/scripts/expire-iso8601.new
index e586e267e7389221b05ecdfeceddfd8d2565a5b1..169961a75d6a3cc1137ffd4caa030499d7db0274 100755 (executable)
--- a/scripts/expire-iso8601.new
+++ b/scripts/expire-iso8601.new
@@ -55,6 +55,7 @@ our $rm = 1;
 our $recurse = 1;
 our $unit = 86400;
 our $slop;
+our $debug;
 our @intervals;
 
 sub badusage ($) {
@@ -98,23 +99,24 @@ sub precomp () {
   $_->{A} = ($newest_t - $_->{T}) / $unit foreach @files;
   $slop /= $unit;
 
-#  print DEBUG Dumper(\@files, \@intervals);
+  print DEBUG Dumper(\@files, \@intervals) if $debug >= 2;
 }
 
 sub flag ($) {
   my ($int) = @_;
-  my $n = $int->{Number};
-  my $d = $int->{Interval};
+  my $n = $int->{N};
+  my $d = $int->{D};
+  my $dmin = $d - $slop;
   my $spec = $int->{Spec};
   my $start_age = ($n+1) * $d;
   my $i = 0;
 
-  print DEBUG "FLAG $spec\n";
+  print DEBUG "FLAG $spec sa=$start_age dmin=$dmin\n";
 
   # find $i, the youngest which is at least $number x $interval
   for (;;) {
     print DEBUG "i #$i $files[$i]{A}\n";
-    last if $files[$i]{A} > $start_age;
+    last if $files[$i]{A} >= $start_age;
     if ($i == $#files) {
       print STDERR "insufficient for $spec\n";
     }
@@ -129,10 +131,9 @@ sub flag ($) {
     for (;;) {
       $j--;
       last if $j < 0;
-      last if $files[$j];
       my $dt = $files[$i]{A} - $files[$j]{A};
       print DEBUG "j #$j $files[$j]{A} dt=$dt\n";
-      last if $dt >= $d - $slop;
+      last if $dt >= $dmin;
     }
     last if $j < 0;
 
@@ -165,7 +166,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     while (m/^-./) {
       if (s/^-n/-/) { $rm=0; }
       elsif (s/-r/-/) { $recurse=1; }
-      elsif (s/-D/-/) { open DEBUG, ">&STDERR" or die $!; DEBUG->autoflush(1) }
+      elsif (s/-D/-/) { $debug++; }
       elsif (s/-u(\d+)$//) { $unit=$1; }
       elsif (s/-s(\d+)$//) { $slop=$1; }
       else { badusage "unknown short option $_" }
@@ -180,6 +181,11 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
 
 badusage "too few arguments" unless @ARGV;
 
+if ($debug) {
+  open DEBUG, ">&STDERR" or die $!;
+  DEBUG->autoflush(1);
+}
+
 $slop //= $unit * 0.1;
 
 foreach (@ARGV) {