robin/tf-log-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/tf-log-parser.git synced 2026-06-03 10:14:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

dont split player subject untill needed

Browse source
This commit is contained in:
Robin Appelman 2021-08-08 20:46:41 +02:00
commit c7cfa75e25
2 changed files with 34 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/common.rs
View file

@ -1,4 +1,4 @@
use crate::raw_event::RawSubject;
use crate::raw_event::{split_player_subject, RawSubject};
use enum_iterator::IntoEnumIterator;
use serde::ser::SerializeMap;
use serde::{Serialize, Serializer};
@ -182,10 +182,12 @@ impl TryFrom<&RawSubject<'_>> for SubjectId {
fn try_from(raw: &RawSubject) -> Result<Self, Self::Error> {
Ok(match raw {
RawSubject::Player { steam_id, .. } => {
if let Some(raw_account_id) = steam_id
.strip_prefix("[U:1:")
.and_then(|s| s.strip_suffix(']'))
RawSubject::Player(raw) => {
if let Some(raw_account_id) = raw
.rsplit_once(":")
.map(|(_, s)| s)
.and_then(|s| s.split_once(']'))
.map(|(s, _)| s)
{
SubjectId::Player(
raw_account_id
@ -235,18 +237,17 @@ impl TryFrom<&RawSubject<'_>> for SubjectData {
fn try_from(raw: &RawSubject<'_>) -> Result<Self, Self::Error> {
Ok(match raw {
RawSubject::Player {
name,
user_id,
steam_id,
team,
} => SubjectData::Player {
name: name.to_string(),
user_id: user_id.parse().map_err(|_| SubjectError::InvalidUserId)?,
steam_id: SteamID::from_steam3(steam_id)
.map_err(|_| SubjectError::InvalidSteamId)?,
team: team.parse().map_err(|_| SubjectError::InvalidTeam)?,
},
RawSubject::Player(raw) => {
let (_, (name, user_id, steam_id, team)) =
split_player_subject(raw).map_err(|_| SubjectError::InvalidUserId)?;
SubjectData::Player {
name: name.to_string(),
user_id: user_id.parse().map_err(|_| SubjectError::InvalidUserId)?,
steam_id: SteamID::from_steam3(steam_id)
.map_err(|_| SubjectError::InvalidSteamId)?,
team: team.parse().map_err(|_| SubjectError::InvalidTeam)?,
}
}
RawSubject::Team(team) => SubjectData::Team(team.parse().unwrap()),
RawSubject::System(name) => SubjectData::System(name.to_string()),
RawSubject::Console => SubjectData::Console,

55
src/raw_event.rs
View file

@ -2,7 +2,7 @@ use crate::{SubjectError, SubjectId};
use chrono::{DateTime, TimeZone, Utc};
use enum_iterator::IntoEnumIterator;
use nom::branch::alt;
use nom::bytes::complete::{tag, take_while};
use nom::bytes::complete::{tag, tag_no_case, take_while};
use nom::character::complete::{digit1, one_of};
use nom::error::{make_error, ErrorKind};
use nom::{Finish, IResult};
@ -104,12 +104,7 @@ fn date_parser(input: &str) -> IResult<&str, RawDate> {
#[derive(Debug, PartialEq)]
pub enum RawSubject<'a> {
Player {
name: &'a str,
user_id: &'a str,
steam_id: &'a str,
team: &'a str,
},
Player(&'a str),
Team(&'a str),
System(&'a str),
Console,
@ -117,16 +112,6 @@ pub enum RawSubject<'a> {
}
impl<'a> RawSubject<'a> {
pub fn name(&self) -> &'a str {
match self {
RawSubject::Player { name, .. } => name,
RawSubject::Team(team) => team,
RawSubject::System(system) => system,
RawSubject::Console => "Console",
RawSubject::World => "World",
}
}
pub fn id(&self) -> Result<SubjectId, SubjectError> {
self.try_into()
}
@ -145,7 +130,7 @@ fn subject_parser_console(input: &str) -> IResult<&str, RawSubject> {
fn subject_parser_team(input: &str) -> IResult<&str, RawSubject> {
let (input, _) = tag(r#"Team ""#)(input)?;
let (input, team) = alt((tag("Red"), tag("Blue")))(input)?;
let (input, team) = alt((tag_no_case("red"), tag_no_case("blue")))(input)?;
let (input, _) = one_of("\"")(input)?;
Ok((input, RawSubject::Team(team)))
@ -165,9 +150,7 @@ fn subject_parser_system(input: &str) -> IResult<&str, RawSubject> {
Ok((input, RawSubject::System(name)))
}
fn subject_parser_player(input: &str) -> IResult<&str, RawSubject> {
let (input, _) = one_of("\"")(input)?;
pub fn split_player_subject(input: &str) -> IResult<&str, (&str, &str, &str, &str)> {
let (input, name) = take_while(|c| c != '<')(input)?;
let (input, _) = one_of("<")(input)?;
@ -182,25 +165,25 @@ fn subject_parser_player(input: &str) -> IResult<&str, RawSubject> {
let (input, team) = take_while(|c| c != '>')(input)?;
let (input, _) = one_of(">")(input)?;
Ok((input, (name, user_id, steam_id, team)))
}
fn subject_parser_player(input: &str) -> IResult<&str, RawSubject> {
let (input, _) = one_of("\"")(input)?;
Ok((
input,
RawSubject::Player {
name,
user_id,
steam_id,
team,
},
))
let (input, subject) = take_while(|c| c != '"')(input)?;
let (input, _) = one_of("\"")(input)?;
Ok((input, RawSubject::Player(subject)))
}
pub fn subject_parser(input: &str) -> IResult<&str, RawSubject> {
alt((
subject_parser_console,
subject_parser_player,
subject_parser_world,
subject_parser_team,
subject_parser_player,
subject_parser_system,
))(input)
}
@ -338,7 +321,6 @@ fn event_type_parser(input: &str) -> IResult<&str, RawEventType> {
return Ok((input, event_type));
}
}
dbg!(input);
Err(nom::Err::Error(make_error(input, ErrorKind::NoneOf)))
}
@ -357,14 +339,9 @@ fn test_parse_raw() {
minutes: "13",
seconds: "57",
},
subject: RawSubject::Player {
name: "makxbi",
user_id: "27",
steam_id: "[U:1:40364391]",
team: "Red",
},
subject: RawSubject::Player("makxbi<27><[U:1:40364391]><Red>"),
ty: RawEventType::ChangedRole,
params: r#""sniper""#,
params: r#"to "sniper""#,
},
raw
);