Revert "remove some boilerplate"

This reverts commit 4591ab6.

src/structs/api.rs

@@ -4,8 +4,6 @@ use serde::de::{self, MapAccess, Visitor};
 use serde::{Deserialize, Deserializer, Serialize};
 use std::fmt;
 
-use crate::utils::{IsacError, IsacInfo};
-
 /// the status code of the response
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Status {
@@ -14,23 +12,13 @@ pub struct Status {
 }
 
 impl Status {
-    /// return an [`IsacInfo::APIError`] if the status is not `ok`
-    pub fn error_for_status(&self) -> Result<(), IsacError> {
-        match self.status.as_str() == "ok" {
-            true => Ok(()),
-            false => Err(IsacInfo::APIError {
-                msg: self.err_msg(),
-            })?,
-        }
-    }
     /// true if the status code is "ok"
     pub fn ok(&self) -> bool {
         matches!(self.status.as_str(), "ok")
     }
     /// return the error message, return "Unknown Error" if its None
-    pub fn err_msg(&self) -> String {
+    pub fn err_msg(self) -> String {
         self.error
-            .as_ref()
             .map(|e| e.message.clone())
             .unwrap_or("Unknown Error".to_string())
     }

src/structs/clan_battles_season_stats.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use super::api;
-use crate::utils::IsacError;
+use crate::utils::{IsacError, IsacInfo};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PlayerClanBattleAPIRes {
@@ -24,7 +24,12 @@ impl TryFrom<PlayerClanBattleAPIRes> for PlayerClanBattle {
     type Error = IsacError;
 
     fn try_from(value: PlayerClanBattleAPIRes) -> Result<Self, Self::Error> {
-        value.status.error_for_status()?;
+        if !value.status.ok() {
+            return Err(IsacInfo::APIError {
+                msg: value.status.err_msg(),
+            }
+            .into());
+        }
         Ok(value
             .data
             .into_iter()

src/structs/clan_detail.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use super::{api, ClanTag};
-use crate::utils::IsacError;
+use crate::utils::{IsacError, IsacInfo};
 
 // #[derive(Debug, Deserialize, Serialize)]
 // pub struct ClanDetailMember {
@@ -47,8 +47,13 @@ pub struct ClanDetailAPIRes {
 impl ClanDetailAPIRes {
     /// check the status is "ok" before getting the data
     pub fn data(self) -> Result<ClanDetail, IsacError> {
-        self.status.error_for_status()?;
-        Ok(self.data.into_values().next().unwrap())
+        if !self.status.ok() {
+            Err(IsacInfo::APIError {
+                msg: self.status.err_msg(),
+            })?
+        } else {
+            Ok(self.data.into_values().next().unwrap())
+        }
     }
 }
 

src/structs/player.rs

@@ -3,7 +3,7 @@ use crate::{
         api, Dogtag, PartialClan, PlayerClanBattle, Region, Ship, ShipModeStatsPair,
         ShipStatsCollection,
     },
-    utils::{wws_api::WowsApi, IsacError, LoadSaveFromJson},
+    utils::{wws_api::WowsApi, IsacError, IsacInfo, LoadSaveFromJson},
     Context,
 };
 
@@ -140,7 +140,11 @@ impl TryFrom<VortexPlayerAPIRes> for VortexPlayer {
     type Error = IsacError;
 
     fn try_from(value: VortexPlayerAPIRes) -> Result<Self, Self::Error> {
-        value.status.error_for_status()?;
+        if !value.status.ok() {
+            Err(IsacInfo::APIError {
+                msg: value.status.err_msg(),
+            })?
+        };
         Ok(value.data.into_iter().next().unwrap().1)
     }
 }

src/structs/ship.rs

@@ -159,8 +159,12 @@ impl TryFrom<VortexShipAPIRes> for ShipStatsCollection {
     type Error = IsacError;
 
     fn try_from(mut value: VortexShipAPIRes) -> Result<Self, Self::Error> {
-        value.status.error_for_status()?;
-
+        if !value.status.ok() {
+            return Err(IsacInfo::APIError {
+                msg: value.status.err_msg(),
+            }
+            .into());
+        }
         let player_stats = value.data.values_mut().last().ok_or(IsacInfo::APIError {
             msg: "expected PlayerStats".to_string(),
         })?;

src/structs/ships_para.rs

@@ -130,32 +130,36 @@ impl TryFrom<VortexVehicleAPIRes> for ShipsPara {
     type Error = IsacError;
 
     fn try_from(res: VortexVehicleAPIRes) -> Result<Self, Self::Error> {
-        res.status.error_for_status()?;
-
-        let output = res
-            .data
-            .into_iter()
-            .map(|(k, mut v)| {
-                let class = v
-                    .tags
-                    .iter()
-                    .find_map(ShipClass::from_tag)
-                    .expect("missing ship class tag");
-                let ship = Ship {
-                    ship_id: k,
-                    tier: v.level,
-                    tier_roman: v.level.into(),
-                    class,
-                    name: v.localization.mark.remove("en").expect("missing en"),
-                    short_name: v.localization.shortmark.remove("en").expect("missing en"),
-                    nation: v.nation,
-                    icon: v.icons.small,
-                };
-                (k, ship)
-            })
-            .collect::<HashMap<ShipId, Ship>>()
-            .into();
-        Ok(output)
+        if !res.status.ok() {
+            Err(IsacInfo::APIError {
+                msg: res.status.err_msg(),
+            })?
+        } else {
+            let output = res
+                .data
+                .into_iter()
+                .map(|(k, mut v)| {
+                    let class = v
+                        .tags
+                        .iter()
+                        .find_map(ShipClass::from_tag)
+                        .expect("missing ship class tag");
+                    let ship = Ship {
+                        ship_id: k,
+                        tier: v.level,
+                        tier_roman: v.level.into(),
+                        class,
+                        name: v.localization.mark.remove("en").expect("missing en"),
+                        short_name: v.localization.shortmark.remove("en").expect("missing en"),
+                        nation: v.nation,
+                        icon: v.icons.small,
+                    };
+                    (k, ship)
+                })
+                .collect::<HashMap<ShipId, Ship>>()
+                .into();
+            Ok(output)
+        }
     }
 }
 

src/utils/wws_api.rs

@@ -403,9 +403,13 @@ impl TryFrom<VortexPlayerSearchAPIRes> for Vec<VortexPlayerSearch> {
     type Error = IsacError;
 
     fn try_from(res: VortexPlayerSearchAPIRes) -> Result<Self, Self::Error> {
-        res.status.error_for_status()?;
-
-        Ok(res.data)
+        if !res.status.ok() {
+            Err(IsacInfo::APIError {
+                msg: res.status.err_msg(),
+            })?
+        } else {
+            Ok(res.data)
+        }
     }
 }