From df28d5c0140ba95fc7dd499af952df586dbe6ee3 Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 15 Jan 2019 14:38:05 -0500 Subject: [PATCH] fix: parse experience with commas and add blue mage again --- src/logic/character.rs | 4 ++-- src/models/character.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/logic/character.rs b/src/logic/character.rs index 0b673e6..ab55632 100644 --- a/src/logic/character.rs +++ b/src/logic/character.rs @@ -222,7 +222,7 @@ fn parse_job<'a>(elem: ElementRef<'a>) -> Result<(Job, JobInfo)> { let first_exp = exp_split.next().unwrap(); // must have first element let experience: Option = match first_exp { "-" | "--" => None, - x => Some(x.parse().map_err(Error::InvalidNumber)?), + x => Some(x.replace(",", "").parse().map_err(Error::InvalidNumber)?), }; let second_exp = exp_split @@ -230,7 +230,7 @@ fn parse_job<'a>(elem: ElementRef<'a>) -> Result<(Job, JobInfo)> { .ok_or_else(|| Error::invalid_content("experience split by ` / `", Some(&exp_str)))?; let next_level_experience: Option = match second_exp { "-" | "--" => None, - x => Some(x.parse().map_err(Error::InvalidNumber)?), + x => Some(x.replace(",", "").parse().map_err(Error::InvalidNumber)?), }; let info = JobInfo { diff --git a/src/models/character.rs b/src/models/character.rs index f49bcb8..2cab3f9 100644 --- a/src/models/character.rs +++ b/src/models/character.rs @@ -86,6 +86,7 @@ ffxiv_enum!( Arcanist => "arcanist", Summoner => "summoner", RedMage => "red mage", + BlueMage => "blue mage", Carpenter => "carpenter", Blacksmith => "blacksmith",