Refactor Devil Fruit Scraper (#5)

* update tokio

* wip refactor scraper

* refactored scraper code

Author: muhrifqii

Cargo.lock

@@ -13,7 +13,7 @@ repository = "https://github.com/muhrifqii/opdb-rust.git"
 readme = "README.md"
 
 [workspace.dependencies]
-tokio = { version = "1.44.1", features = ["full"] }
+tokio = { version = "1.44.2", features = ["full"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 strum = { version = "0.27.1", features = ["derive"] }
@@ -26,3 +26,5 @@ reqwest = "0.12.15"
 strsim = "0.11.1"
 clap = { version = "4.5.35", features = ["derive"] }
 scraper = "0.23.1"
+lazy_static = "1.5.0"
+async-trait = "0.1.88"

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "opdb-scrapper"
+name = "opdb_scrapper"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true
@@ -24,6 +24,8 @@ reqwest = { workspace = true }
 strsim = { workspace = true }
 clap = { workspace = true }
 scraper = { workspace = true }
+lazy_static = { workspace = true }
+async-trait = { workspace = true }
 
 [dev-dependencies]
 mockall = "0.13.1"

scraper/Cargo.toml

@@ -1,3 +1,4 @@
 pub mod models;
+pub mod parser;
 pub mod scraper;
 pub mod types;

scraper/src/df/mod.rs

@@ -1,7 +1,7 @@
 use serde::Serialize;
 use std::cmp::Ordering;
 
-use super::types::{DfSubType, DfType};
+use super::types::{DfSubType, DfType, HasDevilFruit};
 use crate::types::UrlTyped;
 
 #[derive(Debug, Serialize, Default)]
@@ -22,6 +22,23 @@ impl std::fmt::Display for DfTypeInfo {
     }
 }
 
+#[derive(Debug)]
+pub struct DevilFruitName {
+    name: String,
+    en_name: String,
+    description: String,
+}
+
+impl DevilFruitName {
+    pub fn new(name: String, en_name: String, description: String) -> Self {
+        Self {
+            name,
+            en_name,
+            description,
+        }
+    }
+}
+
 #[derive(Debug, Serialize)]
 pub struct DevilFruit {
     pub df_type: DfType,
@@ -33,6 +50,48 @@ pub struct DevilFruit {
     pub df_url: String,
 }
 
+impl DevilFruit {
+    pub fn zoan(
+        sub_type: Option<DfSubType>,
+        name_detail: DevilFruitName,
+        pic_url: String,
+        df_url: String,
+    ) -> Self {
+        Self {
+            df_type: DfType::Zoan,
+            df_sub_type: sub_type,
+            name: name_detail.name,
+            en_name: name_detail.en_name,
+            description: name_detail.description,
+            pic_url,
+            df_url,
+        }
+    }
+
+    pub fn non_zoan(
+        df_type: DfType,
+        name_detail: DevilFruitName,
+        pic_url: String,
+        df_url: String,
+    ) -> Self {
+        Self {
+            df_type,
+            df_sub_type: None,
+            name: name_detail.name,
+            en_name: name_detail.en_name,
+            description: name_detail.description,
+            pic_url,
+            df_url,
+        }
+    }
+}
+
+impl HasDevilFruit for DevilFruit {
+    fn df_type(&self) -> DfType {
+        self.df_type
+    }
+}
+
 impl std::fmt::Display for DevilFruit {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(
@@ -92,12 +151,12 @@ mod tests {
     use crate::{
         df::{
             models::DfTypeInfo,
-            types::{DfSubType, DfType},
+            types::{DfSubType, DfType, HasDevilFruit},
         },
         types::UrlTyped,
     };
 
-    use super::{Character, DevilFruit};
+    use super::{Character, DevilFruit, DevilFruitName};
 
     #[test]
     fn df_has_valid_traits() {
@@ -146,6 +205,7 @@ mod tests {
             format!("(df_type: {}, df_sub_type: {:?}, name: {}, english name: {}, pic: {}, url: {}, description: {})",
                 df1.df_type, df1.df_sub_type, df1.name, df1.en_name, df1.pic_url, df1.df_url, df1.description
             ));
+        assert_eq!(DfType::Zoan, df3.df_type());
     }
 
     #[test]
@@ -157,4 +217,30 @@ mod tests {
         };
         assert_eq!(character.get_path(), "/wiki/Character:1234");
     }
+
+    #[test]
+    fn df_constructor_tests() {
+        let df = DevilFruit::zoan(
+            Some(DfSubType::MythicalZoan),
+            DevilFruitName::new(
+                "fruito".to_string(),
+                "fruit".to_string(),
+                "lorem".to_string(),
+            ),
+            "".to_string(),
+            "".to_string(),
+        );
+        assert_eq!("fruit", df.en_name);
+        let df = DevilFruit::non_zoan(
+            DfType::Logia,
+            DevilFruitName::new(
+                "ananas".to_string(),
+                "pinaple".to_string(),
+                "lorem".to_string(),
+            ),
+            "".to_string(),
+            "".to_string(),
+        );
+        assert_eq!("ananas", df.name);
+    }
 }