robin/log-normalizer
1
0
Fork 0
mirror of https://codeberg.org/icewind/log-normalizer.git synced 2026-06-03 13:54:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle null teams in events

Browse source
This commit is contained in:
Robin Appelman 2020-06-21 15:51:46 +02:00
commit 648d443847
3 changed files with 56 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/database.rs
View file

@ -52,27 +52,31 @@ pub async fn store_log(pool: &PgPool, id: i32, log: &NormalizedLog) -> Result<()
for event in &round.events {
match event {
Event::PointCap { time, team, point } => {
sqlx::query!(
"INSERT INTO events_point_cap(round_id, time, team, point)\
if let Some(team) = team {
sqlx::query!(
"INSERT INTO events_point_cap(round_id, time, team, point)\
VALUES($1, $2, $3, $4)",
round_id,
*time as i32,
*team as TeamId,
*point as i32,
)
.execute(&mut tx)
.await?;
round_id,
*time as i32,
*team as TeamId,
*point as i32,
)
.execute(&mut tx)
.await?;
}
}
Event::RoundWin { time, team } => {
sqlx::query!(
"INSERT INTO events_round_win(round_id, time, team)\
if let Some(team) = team {
sqlx::query!(
"INSERT INTO events_round_win(round_id, time, team)\
VALUES($1, $2, $3)",
round_id,
*time as i32,
team.unwrap_or_default() as TeamId,
)
.execute(&mut tx)
.await?;
round_id,
*time as i32,
team.unwrap_or_default() as TeamId,
)
.execute(&mut tx)
.await?;
}
}
Event::MedicDeath {
time,
@ -80,7 +84,8 @@ pub async fn store_log(pool: &PgPool, id: i32, log: &NormalizedLog) -> Result<()
steamid,
killer,
} => {
sqlx::query!(
if let Some(team) = team {
sqlx::query!(
"INSERT INTO events_medic_death(round_id, time, team, steam_id, killer)\
VALUES($1, $2, $3, $4, $5)",
round_id,
@ -89,24 +94,27 @@ pub async fn store_log(pool: &PgPool, id: i32, log: &NormalizedLog) -> Result<()
u64::from(*steamid) as i64,
u64::from(*killer) as i64,
)
.execute(&mut tx)
.await?;
.execute(&mut tx)
.await?;
}
}
Event::Drop {
time,
steamid,
team,
} => {
sqlx::query!(
"INSERT INTO events_drop(round_id, time, team, steam_id)\
if let Some(team) = team {
sqlx::query!(
"INSERT INTO events_drop(round_id, time, team, steam_id)\
VALUES($1, $2, $3, $4)",
round_id,
*time as i32,
*team as TeamId,
u64::from(*steamid) as i64,
)
.execute(&mut tx)
.await?;
round_id,
*time as i32,
*team as TeamId,
u64::from(*steamid) as i64,
)
.execute(&mut tx)
.await?;
}
}
Event::Charge {
medigun,
@ -114,17 +122,19 @@ pub async fn store_log(pool: &PgPool, id: i32, log: &NormalizedLog) -> Result<()
steamid,
team,
} => {
sqlx::query!(
"INSERT INTO events_charge(round_id, time, team, medigun, steam_id)\
if let Some(team) = team {
sqlx::query!(
"INSERT INTO events_charge(round_id, time, team, medigun, steam_id)\
VALUES($1, $2, $3, $4, $5)",
round_id,
*time as i32,
*team as TeamId,
*medigun as Medigun,
u64::from(*steamid) as i64,
)
.execute(&mut tx)
.await?;
round_id,
*time as i32,
*team as TeamId,
*medigun as Medigun,
u64::from(*steamid) as i64,
)
.execute(&mut tx)
.await?;
}
}
_ => {}
}

4
src/normalized.rs
View file

@ -166,7 +166,7 @@ impl From<crate::raw::Round> for Round {
.first_cap
.or_else(|| {
raw.events.iter().find_map(|event| match event {
Event::PointCap { team, .. } => Some(*team),
Event::PointCap { team, .. } => *team,
_ => None,
})
})
@ -231,7 +231,7 @@ fn normalize_stopwatch_events(log: &mut NormalizedLog) {
let last_event = log.rounds[1].events.pop();
log.rounds[1].events.push(Event::PointCap {
time: second_half_end_time,
team: TeamId::Blue,
team: Some(TeamId::Blue),
point: first_half_rounds,
});
if let Some(last_event) = last_event {

10
src/raw.rs
View file

@ -196,28 +196,28 @@ pub enum Event {
medigun: Medigun,
time: u32,
steamid: SteamID,
team: TeamId,
team: Option<TeamId>,
},
#[serde(rename = "pointcap")]
PointCap {
time: u32,
team: TeamId,
team: Option<TeamId>,
point: u8,
},
MedicDeath {
time: u32,
team: TeamId,
team: Option<TeamId>,
steamid: SteamID,
killer: SteamID,
},
RoundWin {
time: u32,
team: Option<TeamId>,
team: Option<Option<TeamId>>,
},
Drop {
time: u32,
steamid: SteamID,
team: TeamId,
team: Option<TeamId>,
},
#[serde(other)]
Other,