stephenseo/EN605.607.81.SP22_ASDM_Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

back-end: Do refactorings

Browse source
This commit is contained in:
Stephen Seo 2022-05-05 12:35:30 +09:00
parent 1872c4877e
commit 59b2bc34fb
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
back_end/src/db_handler.rs
View file

@ -1033,7 +1033,7 @@ impl DBHandler {
for row_result in rows { for row_result in rows {
if let Ok((id, status, board)) = row_result { if let Ok((id, status, board)) = row_result {
self.have_ai_take_players_turn(Some(&conn), id, status, board)?; self.have_ai_take_players_turn(Some(&conn), id, status, &board)?;
} else { } else {
unreachable!("This part should never execute"); unreachable!("This part should never execute");
} }
@ -1047,7 +1047,7 @@ impl DBHandler {
conn: Option<&Connection>, conn: Option<&Connection>,
game_id: u32, game_id: u32,
status: u32, status: u32,
board_string: String, board_string: &str,
) -> Result<(), String> { ) -> Result<(), String> {
if status > 1 { if status > 1 {
return Err(String::from( return Err(String::from(
@ -1064,7 +1064,7 @@ impl DBHandler {
}; };
let is_cyan = status == 0; let is_cyan = status == 0;
let board = board_from_string(&board_string); let board = board_from_string(board_string);
let mut ai_choice_pos: usize = get_ai_choice( let mut ai_choice_pos: usize = get_ai_choice(
AIDifficulty::Hard, AIDifficulty::Hard,
if is_cyan { if is_cyan {
@ -1268,17 +1268,18 @@ pub fn start_db_handler_thread(
} }
if cleanup_instant.elapsed() > cleanup_duration { if cleanup_instant.elapsed() > cleanup_duration {
let conn = handler.get_conn(DBFirstRun::NotFirstRun).ok();
cleanup_instant = Instant::now(); cleanup_instant = Instant::now();
if let Err(e) = handler.cleanup_stale_games(None) { if let Err(e) = handler.cleanup_stale_games(conn.as_ref()) {
println!("{}", e); println!("{}", e);
} }
if let Err(e) = handler.cleanup_stale_players(None) { if let Err(e) = handler.cleanup_stale_players(conn.as_ref()) {
println!("{}", e); println!("{}", e);
} }
if let Err(e) = handler.cleanup_stale_emotes(None) { if let Err(e) = handler.cleanup_stale_emotes(conn.as_ref()) {
println!("{}", e); println!("{}", e);
} }
if let Err(e) = handler.clear_empty_games(None) { if let Err(e) = handler.clear_empty_games(conn.as_ref()) {
println!("{}", e); println!("{}", e);
} }
} }