expire-8601: new version seems good now

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

diff --git a/scripts/expire-iso8601.new b/scripts/expire-iso8601.new
index bcf4ec9b322061fc4f8d7e230db0b540585737ab..d9e009cd2e07e1e699167ce559295c7407a34e5b 100755 (executable)
--- a/scripts/expire-iso8601.new
+++ b/scripts/expire-iso8601.new
@@ -44,14 +44,18 @@ exit status:
    16                  catastrophic failure
 END
 
+use POSIX;
 use Carp;
-use DateTime::Format::RFC3339;
+use Data::Dumper;
+use Date::Parse;
+use DateTime::Format::Strptime;
 
 our @files;
 our $rm = 1;
 our $recurse = 1;
 our $unit = 86400;
 our $slop;
+our $debug = 0;
 our @intervals;
 
 sub badusage ($) {
@@ -60,17 +64,25 @@ sub badusage ($) {
 }
 
 sub scan () {
-  my $parser = DateTime::Format::RFC3339->new;
-
+#  my $strp = DateTime::Format::Strptime->new();
   foreach my $f (<[0-9]*>) {
     if ($f  !~ m/^ \d\d\d\d - \d\d - \d\d 
                 (?: T \d\d \: \d\d (?: \: \d\d )?
                   (?: [-+] \d{1,2} \:? \d\d )? )? /x) {
       print STDERR "ignoring $f\n";
     }
-    $!=0; $?=0; my $t = `date -d '$&' +%s`;
-    die "date(!) failed on $&: $? $!" if $! || $?;
-    chomp $t or confess;
+    my @t = Date::Parse::strptime($f);
+    @t = map { $_ // 0 } @t;
+    my $t = mktime @t;
+#    m
+#    my $t = $strp->parse_datetime($f);
+#    $t = $t->epoch();
+#    my @t = Date::Parse::strptime($f);
+#print STDERR Dumper(\@t);
+#    my $t = mktime(@t);
+#    $!=0; $?=0; my $t = `date -d '$&' +%s`;
+#    die "date(!) failed on $&: $? $!" if $! || $?;
+#    chomp $t or confess;
     push @files, { F => $f, T => $t, U => [] };
   }
 }
@@ -86,21 +98,27 @@ sub precomp () {
   my $newest_t = $files[0]{T};
   $_->{A} = ($newest_t - $_->{T}) / $unit foreach @files;
   $slop /= $unit;
+
+  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 $dmax = $d + $slop;
   my $spec = $int->{Spec};
-  my $start_age = ($n+1) * $d;
+  my $start_age = ($n-1) * $d - $slop;
   my $i = 0;
 
-  # find $i, the youngest which is at least $number x $interval
+  print DEBUG "FLAG $spec sa=$start_age dmax=$dmax\n";
+
+  # find $i, the youngest which is at least $start_age
   for (;;) {
-    last if $files[$i]{A} > $start_age;
+    print DEBUG "i #$i $files[$i]{A}\n";
+    last if $files[$i]{A} >= $start_age;
     if ($i == $#files) {
-      print STDERR "insufficient for $spec\n";
+      print STDERR "insufficiently old for $spec\n";
     }
     $i++;
   }
@@ -108,16 +126,23 @@ sub flag ($) {
   for (;;) {
     push @{ $files[$i]{U} }, $spec;
 
-    # find $j, the closest to $i which is at least $d-slop younger
+    # find $j, the closest to $i, preferably no more than $dmax younger
     my $j = $i;
     for (;;) {
       $j--;
+      # at each point in this loop $j is the next candidate
       last if $j < 0;
-      last if $files[$j];
       my $dt = $files[$i]{A} - $files[$j]{A};
-      last if $dt >= $d - $slop;
+      print DEBUG "j #$j $files[$j]{A} dt=$dt\n";
+      last if $dt > $dmax;
     }
     last if $j < 0;
+    $j++;
+    if ($j == $i) {
+      $j--;
+      print STDERR "insufficiently dense for $spec after $files[$j]{F}\n";
+    }
+    print DEBUG "i #$j\n";
 
     $i = $j;
   }
@@ -139,6 +164,8 @@ sub implement () {
   }
 }
 
+open DEBUG, ">/dev/null" or die $!;
+
 while (@ARGV && $ARGV[0] =~ m/^-/) {
   $_ = shift @ARGV;
   last if $_ eq '-' || $_ eq '--';
@@ -146,6 +173,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     while (m/^-./) {
       if (s/^-n/-/) { $rm=0; }
       elsif (s/-r/-/) { $recurse=1; }
+      elsif (s/-D/-/) { $debug++; }
       elsif (s/-u(\d+)$//) { $unit=$1; }
       elsif (s/-s(\d+)$//) { $slop=$1; }
       else { badusage "unknown short option $_" }
@@ -160,11 +188,16 @@ 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) {
   m/^(\d+)x(\d+)$/ or badusage "bad <number>x<interval> $_";
-  push @intervals, { Spec => $&, N => $1, I => $2 };
+  push @intervals, { Spec => $&, N => $1, D => $2 };
 }
 
 scan();