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

View File

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

View File

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