X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=d4a0d73183a2388c5f8930e922680cc3e80fedaf;hp=d6ecbcb4e727dcad1c2aa88e217deeaf887dfa30;hb=243c535dd2efc9d8126aa6c153292d8253239dd9;hpb=d6e53996bae7bd8b01dfb6ed8e61a573bd9157cb

diff --git a/remoteglot.pl b/remoteglot.pl
index d6ecbcb..d4a0d73 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -15,12 +15,13 @@ use AnyEvent::HTTP;
 use Chess::PGN::Parse;
 use EV;
 use Net::Telnet;
-use FileHandle;
+use File::Slurp;
 use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 use URI::Escape;
-use Tie::Persistent;
+use DBI;
+use DBD::Pg;
 require 'Position.pm';
 require 'Engine.pm';
 require 'config.pm';
@@ -38,12 +39,12 @@ my %tb_cache = ();
 my $tb_lookup_running = 0;
 my $last_written_json = undef;
 
-# 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);
-
-tie my %json_for_pos, 'Tie::Persistent', 'analysis_info.db', 'rw';
-(tied %json_for_pos)->autosync(1);
+# Persisted so we can restart.
+# TODO: Figure out an appropriate way to deal with database restarts
+# and/or Postgres going away entirely.
+my $dbh = DBI->connect($remoteglotconf::dbistr, $remoteglotconf::dbiuser, $remoteglotconf::dbipass)
+	or die DBI->errstr;
+$dbh->{RaiseError} = 1;
 
 $| = 1;
 
@@ -481,10 +482,9 @@ sub parse_ids {
 	my ($engine, @x) = @_;
 
 	while (scalar @x > 0) {
-		if ($x[0] =~ /^(name|author)$/) {
-			my $key = shift @x;
+		if ($x[0] eq 'name') {
 			my $value = join(' ', @x);
-			$engine->{'id'}{$key} = $value;
+			$engine->{'id'}{'author'} = $value;
 			last;
 		}
 
@@ -737,10 +737,23 @@ sub output_json {
 
 	my $json = {};
 	$json->{'position'} = $pos_calculating->to_json_hash();
-	$json->{'id'} = $engine->{'id'};
+	$json->{'engine'} = $engine->{'id'};
+	if (defined($remoteglotconf::engine_url)) {
+		$json->{'engine'}{'url'} = $remoteglotconf::engine_url;
+	}
+	if (defined($remoteglotconf::engine_details)) {
+		$json->{'engine'}{'details'} = $remoteglotconf::engine_details;
+	}
+	if (defined($remoteglotconf::move_source)) {
+		$json->{'move_source'} = $remoteglotconf::move_source;
+	}
+	if (defined($remoteglotconf::move_source_url)) {
+		$json->{'move_source_url'} = $remoteglotconf::move_source_url;
+	}
 	$json->{'score'} = long_score($info, $pos_calculating, '');
 	$json->{'short_score'} = short_score($info, $pos_calculating, '');
 	$json->{'plot_score'} = plot_score($info, $pos_calculating, '');
+	$json->{'using_lomonosov'} = defined($remoteglotconf::tb_serial_key);
 
 	$json->{'nodes'} = $info->{'nodes'};
 	$json->{'nps'} = $info->{'nps'};
@@ -782,19 +795,22 @@ sub output_json {
 	if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
 		my %score_history = ();
 
+		my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
 		my $pos = Position->start_pos('white', 'black');
 		my $halfmove_num = 0;
 		for my $move (@{$pos_calculating->{'pretty_history'}}) {
 			my $id = id_for_pos($pos, $halfmove_num);
-			if (exists($json_for_pos{$id}) && defined($json_for_pos{$id}->{'plot_score'})) {
+			my $ref = $dbh->selectrow_hashref($q, undef, $id);
+			if (defined($ref)) {
 				$score_history{$halfmove_num} = [
-					$json_for_pos{$id}->{'plot_score'},
-					$json_for_pos{$id}->{'short_score'}
+					$ref->{'plot_score'},
+					$ref->{'short_score'}
 				];
 			}
 			++$halfmove_num;
 			($pos) = $pos->make_pretty_move($move);
 		}
+		$q->finish;
 
 		# If at any point we are missing 10 consecutive moves,
 		# truncate the history there. This is so we don't get into
@@ -818,6 +834,37 @@ sub output_json {
 		$json->{'score_history'} = \%score_history;
 	}
 
+	# Give out a list of other games going on. (Empty is fine.)
+	if (!$historic_json_only) {
+		my @games = ();
+
+		my $q = $dbh->prepare('SELECT * FROM current_games ORDER BY priority DESC, id');
+		$q->execute;
+		while (my $ref = $q->fetchrow_hashref) {
+			eval {
+				my $other_game_contents = File::Slurp::read_file($ref->{'json_path'});
+				my $other_game_json = JSON::XS::decode_json($other_game_contents);
+
+				die "Missing position" if (!exists($other_game_json->{'position'}));
+				my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white';
+				my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black';
+
+				push @games, {
+					id => $ref->{'id'},
+					name => "$white–$black",
+					url => $ref->{'url'}
+				};
+			};
+			if ($@) {
+				warn "Could not add external game " . $ref->{'json_path'} . ": $@";
+			}
+		}
+
+		if (scalar @games > 0) {
+			$json->{'games'} = \@games;
+		}
+	}
+
 	my $json_enc = JSON::XS->new;
 	$json_enc->canonical(1);
 	my $encoded = $json_enc->encode($json);
@@ -836,15 +883,22 @@ sub output_json {
 		# using a different engine, or if we've calculated deeper.
 		# nodes is used as a tiebreaker. Don't bother about Multi-PV
 		# data; it's not that important.
-		my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($filename);
+		my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($id);
 		my $new_depth = $json->{'depth'} // 0;
 		my $new_nodes = $json->{'nodes'} // 0;
 		if (!defined($old_engine) ||
-		    $old_engine ne $json->{'id'}{'name'} ||
+		    $old_engine ne $json->{'engine'}{'name'} ||
 		    $new_depth > $old_depth ||
 		    ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
 			atomic_set_contents($filename, $encoded);
-			$json_for_pos{$id} = $json;
+			if (defined($json->{'plot_score'})) {
+				local $dbh->{AutoCommit} = 0;
+				$dbh->do('DELETE FROM scores WHERE id=?', undef, $id);
+				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?)', undef,
+					$id, $json->{'plot_score'}, $json->{'short_score'},
+					$json->{'engine'}{'name'}, $new_depth, $new_nodes);
+				$dbh->commit;
+			}
 		}
 	}
 }
@@ -868,25 +922,13 @@ sub id_for_pos {
 }
 
 sub get_json_analysis_stats {
-	my $filename = shift;
-
-	my ($engine, $depth, $nodes);
-
-	open my $fh, "<", $filename
-		or return undef;
-	local $/ = undef;
-	eval {
-		my $json = JSON::XS::decode_json(<$fh>);
-		$engine = $json->{'id'}{'name'} // die;
-		$depth = $json->{'depth'} // 0;
-		$nodes = $json->{'nodes'} // 0;
-	};
-	close $fh;
-	if ($@) {
-		warn "Error in decoding $filename: $@";
-		return undef;
+	my $id = shift;
+	my $ref = $dbh->selectrow_hashref('SELECT * FROM scores WHERE id=?', undef, $id);
+	if (defined($ref)) {
+		return ($ref->{'engine'}, $ref->{'depth'}, $ref->{'nodes'});
+	} else {
+		return ('', 0, 0);
 	}
-	return ($engine, $depth, $nodes);
 }
 
 sub uciprint {
@@ -1138,13 +1180,14 @@ sub find_clock_start {
 	}
 
 	my $id = id_for_pos($pos);
-	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'};
+	my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id);
+	if (defined($clock_info)) {
+		$pos->{'white_clock'} //= $clock_info->{'white_clock'};
+		$pos->{'black_clock'} //= $clock_info->{'black_clock'};
 		if ($pos->{'toplay'} eq 'W') {
-			$pos->{'white_clock_target'} = $clock_info_for_pos{$id}->{'white_clock_target'};
+			$pos->{'white_clock_target'} = $clock_info->{'white_clock_target'};
 		} else {
-			$pos->{'black_clock_target'} = $clock_info_for_pos{$id}->{'black_clock_target'};
+			$pos->{'black_clock_target'} = $clock_info->{'black_clock_target'};
 		}
 		return;
 	}
@@ -1174,16 +1217,17 @@ sub find_clock_start {
 		return;
 	}
 	my $time_left = $pos->{$key};
-	my $clock_info = {
-		white_clock => $pos->{'white_clock'},
-		black_clock => $pos->{'black_clock'}
-	};
+	my ($white_clock_target, $black_clock_target);
 	if ($pos->{'toplay'} eq 'W') {
-		$clock_info->{'white_clock_target'} = $pos->{'white_clock_target'} = time + $time_left;
+		$white_clock_target = $pos->{'white_clock_target'} = time + $time_left;
 	} else {
-		$clock_info->{'black_clock_target'} = $pos->{'black_clock_target'} = time + $time_left;
+		$black_clock_target = $pos->{'black_clock_target'} = time + $time_left;
 	}
-	$clock_info_for_pos{$id} = $clock_info;
+	local $dbh->{AutoCommit} = 0;
+	$dbh->do('DELETE FROM clock_info WHERE id=?', undef, $id);
+	$dbh->do('INSERT INTO clock_info (id, white_clock, black_clock, white_clock_target, black_clock_target) VALUES (?, ?, ?, ?, ?)', undef,
+		$id, $pos->{'white_clock'}, $pos->{'black_clock'}, $white_clock_target, $black_clock_target);
+	$dbh->commit;
 }
 
 sub schedule_tb_lookup {