xerbalind/planetwars.dev
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages 1 Wiki Activity

refactor: rename save_code_bundle to save_code_string

Browse source
This commit is contained in:
Ilion Beyst 2022-07-07 19:13:55 +02:00
parent 6ec792e3bd
commit 0f14dee499
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
planetwars-server/src/lib.rs
View file

@ -51,7 +51,7 @@ pub async fn seed_simplebot(pool: &ConnectionPool) {
let simplebot_code = let simplebot_code =
std::fs::read_to_string(SIMPLEBOT_PATH).expect("could not read simplebot code"); std::fs::read_to_string(SIMPLEBOT_PATH).expect("could not read simplebot code");
modules::bots::save_code_bundle(&simplebot_code, Some(simplebot.id), &conn)?; modules::bots::save_code_string(&simplebot_code, Some(simplebot.id), &conn)?;
println!("initialized simplebot"); println!("initialized simplebot");

3
planetwars-server/src/modules/bots.rs
View file

@ -4,7 +4,8 @@ use diesel::{PgConnection, QueryResult};
use crate::{db, util::gen_alphanumeric, BOTS_DIR}; use crate::{db, util::gen_alphanumeric, BOTS_DIR};
pub fn save_code_bundle( /// Save a string containing bot code as a code bundle.
pub fn save_code_string(
bot_code: &str, bot_code: &str,
bot_id: Option<i32>, bot_id: Option<i32>,
conn: &PgConnection, conn: &PgConnection,

4
planetwars-server/src/routes/bots.rs
View file

@ -14,7 +14,7 @@ use thiserror;
use crate::db::bots::{self, BotVersion}; use crate::db::bots::{self, BotVersion};
use crate::db::ratings::{self, RankedBot}; use crate::db::ratings::{self, RankedBot};
use crate::db::users::User; use crate::db::users::User;
use crate::modules::bots::save_code_bundle; use crate::modules::bots::save_code_string;
use crate::{DatabaseConnection, BOTS_DIR}; use crate::{DatabaseConnection, BOTS_DIR};
use bots::Bot; use bots::Bot;
@ -120,7 +120,7 @@ pub async fn save_bot(
} }
}; };
let _code_bundle = let _code_bundle =
save_code_bundle(&params.code, Some(bot.id), &conn).expect("failed to save code bundle"); save_code_string(&params.code, Some(bot.id), &conn).expect("failed to save code bundle");
Ok(Json(bot)) Ok(Json(bot))
} }

4
planetwars-server/src/routes/demo.rs
View file

@ -1,6 +1,6 @@
use crate::db; use crate::db;
use crate::db::matches::{FullMatchData, FullMatchPlayerData}; use crate::db::matches::{FullMatchData, FullMatchPlayerData};
use crate::modules::bots::save_code_bundle; use crate::modules::bots::save_code_string;
use crate::modules::matches::{MatchPlayer, RunMatch}; use crate::modules::matches::{MatchPlayer, RunMatch};
use crate::ConnectionPool; use crate::ConnectionPool;
use axum::extract::Extension; use axum::extract::Extension;
@ -42,7 +42,7 @@ pub async fn submit_bot(
let opponent_bot_version = let opponent_bot_version =
db::bots::active_bot_version(opponent.id, &conn).map_err(|_| StatusCode::BAD_REQUEST)?; db::bots::active_bot_version(opponent.id, &conn).map_err(|_| StatusCode::BAD_REQUEST)?;
let player_bot_version = save_code_bundle(&params.code, None, &conn) let player_bot_version = save_code_string(&params.code, None, &conn)
// TODO: can we recover from this? // TODO: can we recover from this?
.expect("could not save bot code"); .expect("could not save bot code");