anyhow, cargo fmt

resource_api/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+anyhow = "1.0.102"
 paste = "1.0.15"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"

resource_api/src/main.rs

@@ -8,4 +8,5 @@ fn main() {
     singleton::set_item_search(item_search).ok();
     let stellar_jade = singleton::get_item_mini_by_id(&1).unwrap();
     dbg!(stellar_jade);
+    println!("{}", res_parser::common::Hash::from_str("HelLONi1"));
 }

resource_api/src/res_parser/common.rs

@@ -2,13 +2,13 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct Hash {
-    pub Hash: i32,
+    #[serde(rename = "Hash")]
+    pub hash: i32,
 }
 
 impl Hash {
-    pub const fn get_i32(s: &str) -> i32 {
+    pub const fn from_str(s: &str) -> i32 {
-        let mut hash1: i32 = 5381;
+        let mut hash1 @ mut hash2 = 5381i32;
-        let mut hash2: i32 = hash1;
 
         let bytes = s.as_bytes();
         let length = bytes.len();
@@ -16,11 +16,9 @@ impl Hash {
         let mut i = 0;
         while i < length {
             hash1 = ((hash1 << 5).wrapping_add(hash1)) ^ (bytes[i] as i32);
-
             if i + 1 < length {
                 hash2 = ((hash2 << 5).wrapping_add(hash2)) ^ (bytes[i + 1] as i32);
             }
-
             i += 2;
         }
 

resource_api/src/res_parser/item.rs

@@ -1,36 +1,50 @@
-use serde::{Deserialize, Serialize};
 use super::common::Hash;
 use super::text_map::TextMaps;
-use std::collections::BTreeMap;
 use crate::types::common::Image;
-use crate::types::item::{ItemSearch, ItemMini};
+use crate::types::item::{ItemMini, ItemSearch};
-
+use anyhow::{Context, Result};
-// C:\Users\yuvlian\Downloads\git\others\srwk\Resources-DUMP\ExcelOutput\ItemConfig.json
+use serde::{Deserialize, Serialize};
-// pub struct ItemSearch(pub BTreeMap<Id, ItemMini>);
+use std::collections::BTreeMap;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ItemConfigs(pub Vec<ItemConfig>);
 
 impl ItemConfigs {
-    pub fn parse_to_api_type(tm: &TextMaps) -> Result<ItemSearch, String> {
+    pub fn parse_to_api_type(tm: &TextMaps) -> Result<ItemSearch> {
-        let file = std::fs::read_to_string("../Resources-DUMP/ExcelOutput/ItemConfig.json").unwrap();
+        let path = "../Resources-DUMP/ExcelOutput/ItemConfig.json";
-        let cfg: Vec<ItemConfig> = serde_json::from_str(&file).unwrap();
+        let file = std::fs::File::open(path).with_context(|| format!("Failed to open {}", path))?;
-        let cfg = ItemConfigs(cfg);
+        let reader = std::io::BufReader::new(file);
-        let mut item_search = BTreeMap::new();
+        let cfg: Vec<ItemConfig> =
-        for item in cfg.0.iter() {
+            serde_json::from_reader(reader).with_context(|| format!("Failed to parse {}", path))?;
-            let id = item.ID;
+
-            // println!("{}", id);
+        let item_search = cfg
-            let name = tm.get_by_hash(item.ItemName).unwrap_or_default();
+            .into_iter()
-            let img = Image { path: String::new(), filename: String::new(), author_info: None };
+            .map(|item| {
-            item_search.insert(id, ItemMini { name: name.Text.clone(), image: img});
+                let id = item.id;
-        }
+                let name = tm.get_by_hash(item.item_name).unwrap_or_default();
+                let img = Image {
+                    path: String::new(),
+                    filename: String::new(),
+                    author_info: None,
+                };
+                (
+                    id,
+                    ItemMini {
+                        name: name.text.clone(),
+                        image: img,
+                    },
+                )
+            })
+            .collect();
+
         Ok(ItemSearch(item_search))
     }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ItemConfig {
-    pub ID: i32,
+    #[serde(rename = "ID")]
-    pub ItemName: Hash,
+    pub id: i32,
+    #[serde(rename = "ItemName")]
+    pub item_name: Hash,
 }
-

resource_api/src/res_parser/mod.rs

@@ -1,5 +1,3 @@
-#![allow(non_snake_case)]
-
 pub mod common;
 pub mod item;
 pub mod text_map;

resource_api/src/res_parser/text_map.rs

@@ -1,45 +1,48 @@
-use serde::{Deserialize, Serialize};
 use super::common::Hash;
-
+use anyhow::{Context, Result};
-// C:\Users\yuvlian\Downloads\git\others\srwk\Resources-DUMP\TextMap\TextMapEN.json
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::fs::File;
+use std::io::BufReader;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct TextMaps(pub Vec<TextMap>);
+pub struct TextMaps(HashMap<i32, TextMap>);
 
 impl TextMaps {
-    pub fn parse() -> Result<Self, String> {
+    pub fn parse() -> Result<Self> {
-        let file = std::fs::read_to_string("../Resources-DUMP/TextMap/TextMapEN.json").unwrap();
+        let path = "../Resources-DUMP/TextMap/TextMapEN.json";
-        let v: Vec<TextMap> = serde_json::from_str(&file).unwrap();
+        let file = File::open(path).with_context(|| format!("Failed to open {}", path))?;
-        Ok(TextMaps(v))
+        let reader = BufReader::new(file);
-    }
+        let v: Vec<TextMap> =
+            serde_json::from_reader(reader).with_context(|| format!("Failed to parse {}", path))?;
 
-    pub fn get_by_i32(&self, i: i32) -> Option<TextMap> {
+        let map = v.into_iter().map(|t| (t.id.hash, t)).collect();
-        self.get_by_hash(Hash { Hash: i })
+        Ok(TextMaps(map))
     }
 
     pub fn get_by_str(&self, s: &str) -> Option<TextMap> {
-        let hash = Hash::get_i32(s);
+        let hash = Hash::from_str(s);
-        self.get_by_hash(Hash { Hash: hash })
+        self.get_by_i32(hash)
+    }
+
+    pub fn get_by_i32(&self, i: i32) -> Option<TextMap> {
+        self.get_by_hash(Hash { hash: i })
     }
 
     pub fn get_by_hash(&self, h: Hash) -> Option<TextMap> {
-        let mut m = None;
+        if h.hash == 0 {
-        if h.Hash == 0 {
+            return None;
-            return m;
         }
-        for t in self.0.iter() {
+        self.0.get(&h.hash).cloned()
-            if t.ID.Hash == h.Hash {
-                m = Some(t.clone());
-                break;
-            }
-        }
-        m
     }
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize)]
 pub struct TextMap {
-    pub ID: Hash,
+    #[serde(rename = "ID")]
-    pub Text: String,
+    pub id: Hash,
-    pub HasParam: bool,
+    #[serde(rename = "Text")]
+    pub text: String,
+    #[serde(rename = "HasParam")]
+    pub has_param: bool,
 }

resource_api/src/types/character.rs

@@ -1,5 +1,5 @@
 use super::common::{
-    Ascension, Count, Desc, Element, Id, Level, Path, Rarity, StatType, StatValue, Image,
+    Ascension, Count, Desc, Element, Id, Image, Level, Path, Rarity, StatType, StatValue,
 };
 use super::item::ItemMini;
 use serde::{Deserialize, Serialize};

resource_api/src/types/lightcone.rs

@@ -1,4 +1,4 @@
-use super::common::{Count, Desc, Id, Level, Path, Rarity, StatValue, Image};
+use super::common::{Count, Desc, Id, Image, Level, Path, Rarity, StatValue};
 use super::item::ItemMini;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};

resource_api/src/types/relic.rs

@@ -1,4 +1,4 @@
-use super::common::{Desc, Id, RelicType, Image};
+use super::common::{Desc, Id, Image, RelicType};
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};