From 14738ac9fc7d92716b19b8f9a76e088d4213a77c Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 4 Sep 2018 23:57:34 -0400 Subject: [PATCH] feat: be case-insensitive --- src/models.rs | 8 ++-- src/models/character.rs | 76 +++++++++++++++---------------- src/models/search/free_company.rs | 12 ++--- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/models.rs b/src/models.rs index 81336cd..2c51018 100644 --- a/src/models.rs +++ b/src/models.rs @@ -8,7 +8,7 @@ macro_rules! ffxiv_enum { impl $name { pub fn parse(s: &str) -> Option { - 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", } ); diff --git a/src/models/character.rs b/src/models/character.rs index a57dceb..b71001d 100644 --- a/src/models/character.rs +++ b/src/models/character.rs @@ -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", } ); diff --git a/src/models/search/free_company.rs b/src/models/search/free_company.rs index 2aeb72b..2dd36fc 100644 --- a/src/models/search/free_company.rs +++ b/src/models/search/free_company.rs @@ -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", });