bin/heat: Accept also 12.34 (besides 12:34).

[nethome.git] / bin / heat

diff --git a/bin/heat b/bin/heat
index 4748edc..2320115 100755 (executable)
--- a/bin/heat
+++ b/bin/heat
@@ -36,9 +36,7 @@ sub logmsg($) {
 sub spawn($) {
   my($cmd)=@_;
   $cmd.=" >&2";
-  system $cmd or return 1;
-  warn "$cmd: $!";
-  return 0;
+  system $cmd and die "$cmd: $!";
 }
 my($trash,$min,$hour)=localtime;
 my $minutes=$hour*60+$min;
@@ -46,18 +44,23 @@ if (($ARGV[0]||"")=~/^[@]0?(\d+):0?(\d+)$/) {
   $minutes=$1*60+$2;
   shift;
 }
-my $schedule=readfile $schedulefile;
 my $finishline;
 my %schedule;
-while ($schedule=~s/^(0?(\d+):0?(\d+)) ([01s])\n//) {
-  my $tm=$2*60+$3;
-  warn "$schedulefile set twice for: $1" if defined $schedule{$tm};
-  $schedule{$tm-24*60}="$1 $4\n";
-  $schedule{$tm      }="$1 $4\n";
-  $schedule{$tm+24*60}="$1 $4\n";
-}
-warn "$schedulefile garbage: $schedule" if $schedule ne "";
+my $schedule;
+if (-e $schedulefile) {
+  $schedule=readfile $schedulefile;
+  while ($schedule=~s/^(0?(\d+):0?(\d+)) ([01s])\n//) {
+    my $tm=$2*60+$3;
+    warn "$schedulefile set twice for: $1" if defined $schedule{$tm};
+    $schedule{$tm-24*60}="$1 $4\n";
+    $schedule{$tm      }="$1 $4\n";
+    $schedule{$tm+24*60}="$1 $4\n";
+  }
+  warn "$schedulefile garbage: $schedule" if $schedule ne "";
+  warn "Empty $schedulefile" if !%schedule;
+}
 sub schedulenext($) {
+  return undef if !%schedule;
   my($now)=@_;
   my($bestprev,$prev,$bestnext,$next);
   for my $found (keys(%schedule)) {
@@ -75,7 +78,7 @@ sub schedulenext($) {
   die "No bestnext" if !defined $bestnext;
   return [$prev,$next];
 }
-$finishline=schedulenext $minutes;
+$finishline=[schedulenext($minutes)->[1]];
 my $silent=shift if ($ARGV[0]||"") eq "-s";
 logmsg "command: ".join(" ",@ARGV) if !$silent&&@ARGV;
 sub info($) {
@@ -89,7 +92,7 @@ sub finish() {
 my $reset=readfile $resetfile if -e $resetfile;
 my($resetminutes,$resetstate);
 sub resetread() {
-  $reset=~/^0?(\d+):0?(\d+) ([01s]|reset)\n$/ or warn "Invalid $resetfile: $reset";
+  $reset=~/^0?(\d+)[:.]0?(\d+) ([01s]|reset)\n$/ or warn "Invalid $resetfile: $reset";
   $resetminutes=$1*60+$2;
   $resetstate=($3 eq "reset"?undef:$3);
 }
@@ -104,7 +107,11 @@ if (defined $reset) {
 }
 sub finishlinereset() {
   $finishline=schedulenext $resetminutes;
-  splice @$finishline,1,0,$reset;
+  if ($finishline) {
+    $finishline=[$reset,$finishline->[1]];
+  } else {
+    $finishline=[$reset];
+  }
 }
 finishlinereset if defined $reset;
 my $state=readfile $statefile;
@@ -120,9 +127,9 @@ sub printminutes($) {
   return sprintf "%02d:%02d",int($m/60),$m%60;
 }
 if ($silent) {
-  if (!defined $newstate&&!defined $reset) {
+  if (!defined $newstate&&!defined $reset&&%schedule) {
     my $prev=schedulenext($minutes)->[0];
-    if ($prev=~m{^@[ printminutes $minutes ] (.)\n$}) {
+    if ($prev=~m{^@{[ printminutes $minutes ]} (.)\n$}) {
       $newstate=$1;
       logmsg "scheduled: $prev";
     }
@@ -136,14 +143,12 @@ if (!defined $newstate) {
 die "state!={s|0|1}" if $newstate!~/^[s01]$/;
 sub setstate() {
   info "->$newstate";
+  writefile $statefile,"$newstate\n" if $state ne $newstate;
+  logmsg "$state->$newstate" if $state ne $newstate;
   my $both={"s"=>[0,0],"0"=>[1,0],"1"=>[1,1]}->{$newstate};
-  $state eq $newstate or unlink $statefile or warn "$statefile: $!";
-  (    spawn "$usbrelay 1 ".$both->[0]
-   and spawn "$usbrelay 2 ".$both->[1])
-  or do { unlink $statefile; die "usbrelay error"; };
-  $state eq $newstate or writefile $statefile,"$newstate\n";
+  spawn "$usbrelay 1 ".$both->[0];
+  spawn "$usbrelay 2 ".$both->[1];
   info "\n";
-  logmsg "$state->$newstate" if $state ne $newstate;
 }
 my $newreset=shift;
 die "Excessive args: ".join(" ",@ARGV) if @ARGV;
@@ -151,7 +156,7 @@ if (!defined $newreset) {
   setstate;
   if (!$silent&&defined $reset) {
     unlink_resetfile;
-    $finishline=schedulenext $minutes;
+    $finishline=[schedulenext($minutes)->[1]];
   }
   finish;
 }