Show material imbalances.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index a94a618035eea6860c40f11afbb9fc6271436e44..9cc82e318fd3b79d617c2128ac3418647a8ce35c 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -20,6 +20,7 @@ use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 use URI::Escape;
+use Tie::Persistent;
 require 'Position.pm';
 require 'Engine.pm';
 require 'config.pm';
@@ -37,8 +38,9 @@ my %tb_cache = ();
 my $tb_lookup_running = 0;
 my $last_written_json = undef;
 
-# TODO: Persist (parts of) this so that we can restart.
-my %clock_target_for_pos = ();
+# Persisted so that we can restart.
+tie my %clock_info_for_pos, 'Tie::Persistent', 'clock_info.db', 'rw';
+(tied %clock_info_for_pos)->autosync(1);       # turn on write back on every modify
 
 $| = 1;
 
@@ -326,7 +328,7 @@ sub handle_pgn {
 
 sub handle_position {
        my ($pos) = @_;
-       find_clock_start($pos);
+       find_clock_start($pos, $pos_calculating);
                
        # if this is already in the queue, ignore it (just update the result)
        if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
@@ -1033,7 +1035,7 @@ sub hms_to_sec {
 }
 
 sub find_clock_start {
-       my $pos = shift;
+       my ($pos, $prev_pos) = @_;
 
        # If the game is over, the clock is stopped.
        if (exists($pos->{'result'}) &&
@@ -1045,6 +1047,9 @@ sub find_clock_start {
 
        # When we don't have any moves, we assume the clock hasn't started yet.
        if ($pos->{'move_num'} == 1 && $pos->{'toplay'} eq 'W') {
+               if (defined($remoteglotconf::adjust_clocks_before_move)) {
+                       &$remoteglotconf::adjust_clocks_before_move(\$pos->{'white_clock'}, \$pos->{'black_clock'}, 1, 'W');
+               }
                return;
        }
 
@@ -1055,29 +1060,52 @@ sub find_clock_start {
        }
 
        my $id = id_for_pos($pos);
-       if (exists($clock_target_for_pos{$id})) {
+       if (exists($clock_info_for_pos{$id})) {
+               $pos->{'white_clock'} //= $clock_info_for_pos{$id}{'white_clock'};
+               $pos->{'black_clock'} //= $clock_info_for_pos{$id}{'black_clock'};
                if ($pos->{'toplay'} eq 'W') {
-                       $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+                       $pos->{'white_clock_target'} = $clock_info_for_pos{$id}->{'white_clock_target'};
                } else {
-                       $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
+                       $pos->{'black_clock_target'} = $clock_info_for_pos{$id}->{'black_clock_target'};
                }
                return;
        }
 
        # OK, we haven't seen this position before, so we assume the move
        # happened right now.
+
+       # See if we should do our own clock management (ie., clock information
+       # is spurious or non-existent).
+       if (defined($remoteglotconf::adjust_clocks_before_move)) {
+               my $wc = $pos->{'white_clock'} // $prev_pos->{'white_clock'};
+               my $bc = $pos->{'black_clock'} // $prev_pos->{'black_clock'};
+               if (defined($prev_pos->{'white_clock_target'})) {
+                       $wc = $prev_pos->{'white_clock_target'} - time;
+               }
+               if (defined($prev_pos->{'black_clock_target'})) {
+                       $bc = $prev_pos->{'black_clock_target'} - time;
+               }
+               &$remoteglotconf::adjust_clocks_before_move(\$wc, \$bc, $pos->{'move_num'}, $pos->{'toplay'});
+               $pos->{'white_clock'} = $wc;
+               $pos->{'black_clock'} = $bc;
+       }
+
        my $key = ($pos->{'toplay'} eq 'W') ? 'white_clock' : 'black_clock';
        if (!exists($pos->{$key})) {
                # No clock information.
                return;
        }
        my $time_left = $pos->{$key};
-       $clock_target_for_pos{$id} = time + $time_left;
+       my $clock_info = {
+               white_clock => $pos->{'white_clock'},
+               black_clock => $pos->{'black_clock'}
+       };
        if ($pos->{'toplay'} eq 'W') {
-               $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+               $clock_info->{'white_clock_target'} = $pos->{'white_clock_target'} = time + $time_left;
        } else {
-               $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
+               $clock_info->{'black_clock_target'} = $pos->{'black_clock_target'} = time + $time_left;
        }
+       $clock_info_for_pos{$id} = $clock_info;
 }
 
 sub schedule_tb_lookup {