|
1 | 1 | use super::{submissions::Submission, AppState, Error, User};
|
2 | 2 | use crate::game::{GameState, GameStatus, Move, Player, TurnStatus};
|
| 3 | +use regex::Regex; |
3 | 4 | use rocket::{
|
4 | 5 | futures::{io::BufReader, AsyncBufReadExt, AsyncReadExt, AsyncWriteExt},
|
5 | 6 | get, post,
|
6 | 7 | serde::json::Json,
|
7 | 8 | tokio::sync::Mutex,
|
8 | 9 | };
|
9 |
| -use std::sync::Arc; |
| 10 | +use std::sync::{Arc, LazyLock}; |
| 11 | + |
| 12 | +static AI_OUTPUT_REGEX: LazyLock<Regex> = |
| 13 | + LazyLock::new(|| Regex::new("^([A-J]\\d,[A-J]\\d;)+$").unwrap()); |
10 | 14 |
|
11 | 15 | #[derive(Debug)]
|
12 | 16 | pub struct Game {
|
@@ -39,18 +43,22 @@ impl Game {
|
39 | 43 | let mut ai_output = String::new();
|
40 | 44 | stderr.read_to_string(&mut ai_output).await?;
|
41 | 45 |
|
42 |
| - let seq = line |
43 |
| - .split(";") |
44 |
| - .map(|m| { |
45 |
| - let chars = m.chars().collect::<Vec<_>>(); |
46 |
| - Move { |
47 |
| - from: convert_cell_id(&chars[0..=1]), |
48 |
| - to: convert_cell_id(&chars[2..=3]), |
49 |
| - } |
50 |
| - }) |
51 |
| - .collect::<Vec<_>>(); |
52 |
| - |
53 |
| - if let Err(Error::InvalidMove) = self.checkers.apply_sequence(&seq) { |
| 46 | + if AI_OUTPUT_REGEX.is_match(&line) { |
| 47 | + let seq = line |
| 48 | + .split(";") |
| 49 | + .map(|m| { |
| 50 | + let chars = m.chars().collect::<Vec<_>>(); |
| 51 | + Move { |
| 52 | + from: convert_cell_id(&chars[0..=1]), |
| 53 | + to: convert_cell_id(&chars[2..=3]), |
| 54 | + } |
| 55 | + }) |
| 56 | + .collect::<Vec<_>>(); |
| 57 | + |
| 58 | + if let Err(Error::InvalidMove) = self.checkers.apply_sequence(&seq) { |
| 59 | + self.checkers.status = GameStatus::Victory(self.human_player) |
| 60 | + } |
| 61 | + } else { |
54 | 62 | self.checkers.status = GameStatus::Victory(self.human_player)
|
55 | 63 | }
|
56 | 64 |
|
|
0 commit comments