bin/heat: Fix missing: heat.schedule

[nethome.git] / bin / heat

diff --git a/bin/heat b/bin/heat
index 1da4a35..74bbbab 100755 (executable)
--- a/bin/heat
+++ b/bin/heat
@@ -78,7 +78,8 @@ sub schedulenext($) {
   die "No bestnext" if !defined $bestnext;
   return [$prev,$next];
 }
-$finishline=schedulenext $minutes;
+$finishline=schedulenext($minutes);
+$finishline=[$finishline->[1]] if $finishline;
 my $silent=shift if ($ARGV[0]||"") eq "-s";
 logmsg "command: ".join(" ",@ARGV) if !$silent&&@ARGV;
 sub info($) {
@@ -92,7 +93,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);
 }
@@ -108,7 +109,7 @@ if (defined $reset) {
 sub finishlinereset() {
   $finishline=schedulenext $resetminutes;
   if ($finishline) {
-    splice @$finishline,1,0,$reset;
+    $finishline=[$reset,$finishline->[1]];
   } else {
     $finishline=[$reset];
   }
@@ -128,10 +129,13 @@ sub printminutes($) {
 }
 if ($silent) {
   if (!defined $newstate&&!defined $reset&&%schedule) {
-    my $prev=schedulenext($minutes)->[0];
-    if ($prev=~m{^@{[ printminutes $minutes ]} (.)\n$}) {
-      $newstate=$1;
-      logmsg "scheduled: $prev";
+    my $prev=schedulenext($minutes);
+    if ($prev) {
+      my $prev=$prev->[0];
+      if ($prev=~m{^@{[ printminutes $minutes ]} (.)\n$}) {
+       $newstate=$1;
+       logmsg "scheduled: $prev";
+      }
     }
   }
   $newstate=$state if !defined $newstate;
@@ -145,6 +149,10 @@ sub setstate() {
   info "->$newstate";
   writefile $statefile,"$newstate\n" if $state ne $newstate;
   logmsg "$state->$newstate" if $state ne $newstate;
+  if ($newstate ne "s") {
+    my $pid=readfile "pidof -x dnf;true|";
+    die "\n".printminutes($minutes)." change $state".($state eq $newstate?"":"->$newstate")." refused: dnf running: $pid" if $pid;
+  }
   my $both={"s"=>[0,0],"0"=>[1,0],"1"=>[1,1]}->{$newstate};
   spawn "$usbrelay 1 ".$both->[0];
   spawn "$usbrelay 2 ".$both->[1];
@@ -156,13 +164,14 @@ if (!defined $newreset) {
   setstate;
   if (!$silent&&defined $reset) {
     unlink_resetfile;
-    $finishline=schedulenext $minutes;
+    $finishline=schedulenext($minutes);
+    $finishline=[$finishline->[1]] if $finishline;
   }
   finish;
 }
 $reset=$newreset;
 if ($reset=~/^\d+$/) {
-  $resetminutes=$reset+$minutes;
+  $resetminutes=($reset+$minutes)%(24*60);
   $reset=printminutes($resetminutes)." reset\n";
   setstate;
 } else {