Format code using rustfmt

This commit is contained in:
Lol3rrr
2024-10-15 23:05:34 +02:00
parent 29ed0a4c37
commit 3af51d2b20
4 changed files with 126 additions and 94 deletions

View File

@@ -66,12 +66,19 @@ impl Analysis for BaseAnalysis {
let base_result = BaseInfo {
map: result.map,
teams: result.teams.into_iter().map(|(numb, team)| {
(numb, BaseTeamInfo {
end_score: team.end_score,
start_side: team.start_side,
teams: result
.teams
.into_iter()
.map(|(numb, team)| {
(
numb,
BaseTeamInfo {
end_score: team.end_score,
start_side: team.start_side,
},
)
})
}).collect(),
.collect(),
players: result
.players
.into_iter()
@@ -119,14 +126,16 @@ impl Analysis for BaseAnalysis {
})
.unzip();
let teams = base_result.teams.into_iter().map(|(numb, team)| {
crate::models::DemoTeam {
let teams = base_result
.teams
.into_iter()
.map(|(numb, team)| crate::models::DemoTeam {
demo_id: input.demoid.clone(),
team: numb as i16,
end_score: team.end_score as i16,
start_name: team.start_side,
}
}).collect::<Vec<_>>();
})
.collect::<Vec<_>>();
let demo_info = crate::models::DemoInfo {
demo_id: input.demoid.clone(),
@@ -179,7 +188,8 @@ impl Analysis for BaseAnalysis {
crate::schema::demo_teams::dsl::demo_id,
crate::schema::demo_teams::dsl::team,
))
.do_update().set((
.do_update()
.set((
crate::schema::demo_teams::dsl::start_name.eq(diesel::upsert::excluded(
crate::schema::demo_teams::dsl::start_name,
)),

View File

@@ -55,17 +55,22 @@ async fn list(
crate::models::DemoTeam::as_select(),
))
.filter(crate::schema::demos::dsl::steam_id.eq(steam_id.to_string()));
let results: Vec<(crate::models::Demo, crate::models::DemoInfo, crate::models::DemoTeam)> =
query.load(&mut crate::db_connection().await).await.unwrap();
let results: Vec<(
crate::models::Demo,
crate::models::DemoInfo,
crate::models::DemoTeam,
)> = query.load(&mut crate::db_connection().await).await.unwrap();
let mut demos = std::collections::HashMap::new();
for (demo, info, team) in results.into_iter() {
let entry = demos.entry(demo.demo_id.clone()).or_insert(common::BaseDemoInfo {
id: demo.demo_id,
map: info.map,
team2_score: 0,
team3_score: 0,
});
let entry = demos
.entry(demo.demo_id.clone())
.or_insert(common::BaseDemoInfo {
id: demo.demo_id,
map: info.map,
team2_score: 0,
team3_score: 0,
});
if team.team == 2 {
entry.team2_score = team.end_score;
@@ -278,7 +283,7 @@ async fn scoreboard(
}
Ok(axum::Json(common::demo_analysis::ScoreBoard {
teams: teams.into_iter().collect::<Vec<_>>()
teams: teams.into_iter().collect::<Vec<_>>(),
}))
}
@@ -445,12 +450,13 @@ async fn perround(
result.push(common::demo_analysis::DemoRound { reason, events });
}
let teams = raw_teams.into_iter().map(|dteam| {
common::demo_analysis::PerRoundTeam {
let teams = raw_teams
.into_iter()
.map(|dteam| common::demo_analysis::PerRoundTeam {
name: dteam.start_name,
number: dteam.team as u32,
}
}).collect();
})
.collect();
Ok(axum::Json(common::demo_analysis::PerRoundResult {
rounds: result,