feat: be case-insensitive

This commit is contained in:
Anna 2018-09-04 23:57:34 -04:00
parent 8725802097
commit 14738ac9fc
3 changed files with 48 additions and 48 deletions

View File

@ -8,7 +8,7 @@ macro_rules! ffxiv_enum {
impl $name { impl $name {
pub fn parse(s: &str) -> Option<Self> { pub fn parse(s: &str) -> Option<Self> {
let res = match s { let res = match s.to_lowercase().as_str() {
$($str_repr => $name::$variant,)+ $($str_repr => $name::$variant,)+
_ => return None, _ => return None,
}; };
@ -31,8 +31,8 @@ pub mod search;
ffxiv_enum!( ffxiv_enum!(
#[derive(PartialEq, Eq, PartialOrd, Ord)] #[derive(PartialEq, Eq, PartialOrd, Ord)]
GrandCompany { GrandCompany {
Flames => "Immortal Flames", Flames => "immortal flames",
Maelstrom => "Maelstrom", Maelstrom => "maelstrom",
TwinAdders => "Order of the Twin Adder", TwinAdders => "order of the twin adder",
} }
); );

View File

@ -53,49 +53,49 @@ ffxiv_enum!(Gender {
}); });
ffxiv_enum!(CityState { ffxiv_enum!(CityState {
Gridania => "Gridania", Gridania => "gridania",
LimsaLominsa => "Limsa Lominsa", LimsaLominsa => "limsa lominsa",
UlDah => "Ul'dah", UlDah => "ul'dah",
}); });
ffxiv_enum!( ffxiv_enum!(
#[derive(PartialEq, Eq, PartialOrd, Ord)] #[derive(PartialEq, Eq, PartialOrd, Ord)]
Job { Job {
Gladiator => "Gladiator", Gladiator => "gladiator",
Paladin => "Paladin", Paladin => "paladin",
Marauder => "Marauder", Marauder => "marauder",
Warrior => "Warrior", Warrior => "warrior",
DarkKnight => "Dark Knight", DarkKnight => "dark knight",
Conjurer => "Conjurer", Conjurer => "conjurer",
WhiteMage => "White Mage", WhiteMage => "white mage",
Scholar => "Scholar", Scholar => "scholar",
Astrologian => "Astrologian", Astrologian => "astrologian",
Pugilist => "Pugilist", Pugilist => "pugilist",
Monk => "Monk", Monk => "monk",
Lancer => "Lancer", Lancer => "lancer",
Dragoon => "Dragoon", Dragoon => "dragoon",
Rogue => "Rogue", Rogue => "rogue",
Ninja => "Ninja", Ninja => "ninja",
Samurai => "Samurai", Samurai => "samurai",
Archer => "Archer", Archer => "archer",
Bard => "Bard", Bard => "bard",
Machinist => "Machinist", Machinist => "machinist",
Thaumaturge => "Thaumaturge", Thaumaturge => "thaumaturge",
BlackMage => "Black Mage", BlackMage => "black mage",
Arcanist => "Arcanist", Arcanist => "arcanist",
Summoner => "Summoner", Summoner => "summoner",
RedMage => "Red Mage", RedMage => "red mage",
Carpenter => "Carpenter", Carpenter => "carpenter",
Blacksmith => "Blacksmith", Blacksmith => "blacksmith",
Armorer => "Armorer", Armorer => "armorer",
Goldsmith => "Goldsmith", Goldsmith => "goldsmith",
Leatherworker => "Leatherworker", Leatherworker => "leatherworker",
Weaver => "Weaver", Weaver => "weaver",
Alchemist => "Alchemist", Alchemist => "alchemist",
Culinarian => "Culinarian", Culinarian => "culinarian",
Miner => "Miner", Miner => "miner",
Botanist => "Botanist", Botanist => "botanist",
Fisher => "Fisher", Fisher => "fisher",
} }
); );

View File

@ -22,13 +22,13 @@ pub struct FreeCompanySearchItem {
} }
ffxiv_enum!(Active { ffxiv_enum!(Active {
Always => "Always", Always => "always",
Weekdays => "Weekdays", Weekdays => "weekdays",
Weekends => "Weekends", Weekends => "weekends",
NotSpecified => "Not specified", NotSpecified => "not specified",
}); });
ffxiv_enum!(RecruitmentStatus { ffxiv_enum!(RecruitmentStatus {
Open => "Open", Open => "open",
Closed => "Closed", Closed => "closed",
}); });