feat: read content

Cargo.toml

@@ -7,7 +7,7 @@ build = "src/ui/build.rs"
 [dependencies]
 slint = "1.17.1"
 rodio = "0.17"
-tokio = { version = "1.47.1", features = ["rt", "rt-multi-thread", "macros", "sync", "time"] }
+tokio = { version = "1.47.1", features = ["rt", "rt-multi-thread", "macros", "sync", "time", "fs"] }
 serde = { version = "1.0.219", features = ["derive"] }
 toml = "0.9.5"
 lazy_static = "1.5.0"

savedata/data.toml

@@ -0,0 +1,6 @@
+cg = [1022]
+
+[read]
+ky02 = 11
+ky01 = 3
+ky03 = 3

savedata/user.toml

@@ -7,6 +7,7 @@ speed = 50.0
 opacity = 0.8
 is_bold = false
 show_shadow = true
+font = "PingFang SC"
 
 [volume]
 main = 100.0

source/cg/length.toml

@@ -1,11 +1,10 @@
-cast = [
-    {name = "ev_rir_03_01", index = 1, length = 3},
-    {name = "ev_rir_03_02", index = 2, length = 1},
-    {name = "ev_rir_03_03", index = 3, length = 1},
-    {name = "ev_rir_04_01", index = 4, length = 5},
-    {name = "ev_rir_04_02", index = 5, length = 1},
-    {name = "ev_rir_04_03", index = 6, length = 1},
-    {name = "ev_rir_04_04", index = 7, length = 1},
-    {name = "ev_rir_04_05", index = 8, length = 1},
-    {name = "ev_rir_06_01", index = 9, length = 1},
-]
+[cast]
+ev_rir_03_01 = { index = 1, length = 3 }
+ev_rir_03_02 = { index = 2, length = 1 }
+ev_rir_03_03 = { index = 3, length = 1 }
+ev_rir_04_01 = { index = 4, length = 5 }
+ev_rir_04_02 = { index = 5, length = 1 }
+ev_rir_04_03 = { index = 6, length = 1 }
+ev_rir_04_04 = { index = 7, length = 1 }
+ev_rir_04_05 = { index = 8, length = 1 }
+ev_rir_06_01 = { index = 9, length = 1 }

source/figure/rar/rar.toml

@@ -1,26 +1,22 @@
 [body]
-cast = [
-    {name = "rar_noa0200", rate = 0.412},
-    {name = "rar_z1a0200", rate = 0.414},
-]
+rar_noa0200 = 0.412
+rar_z1a0200 = 0.414
 
 [face]
-cast = [
-    {name = "noa0002", x = 0.361, y = 0.0825},
-    {name = "noa0015", x = 0.357, y = 0.0907},
-    {name = "noa0039", x = 0.363, y = 0.0907},
-    {name = "noa0041", x = 0.363, y = 0.0874},
-    {name = "noa0052", x = 0.363, y = 0.0874},
-    {name = "noa0053", x = 0.363, y = 0.0874},
-    {name = "noa0054", x = 0.369, y = 0.0899},
-    {name = "z1a0002", x = 0.356, y = 0.0823},
-    {name = "z1a0015", x = 0.352, y = 0.0900},
-    {name = "z1a0039", x = 0.355, y = 0.0905},
-    {name = "z1a0041", x = 0.355, y = 0.0868},
-    {name = "z1a0052", x = 0.355, y = 0.0873},
-    {name = "z1a0053", x = 0.355, y = 0.0873},
-    {name = "z1a0054", x = 0.363, y = 0.0895},
-]
+noa0002 = [0.361, 0.0825]
+noa0015 = [0.357, 0.0907]
+noa0039 = [0.363, 0.0907]
+noa0041 = [0.363, 0.0874]
+noa0052 = [0.363, 0.0874]
+noa0053 = [0.363, 0.0874]
+noa0054 = [0.369, 0.0899]
+z1a0002 = [0.356, 0.0823]
+z1a0015 = [0.352, 0.0900]
+z1a0039 = [0.355, 0.0905]
+z1a0041 = [0.355, 0.0868]
+z1a0052 = [0.355, 0.0873]
+z1a0053 = [0.355, 0.0873]
+z1a0054 = [0.363, 0.0895]
 
 [offset]
-offset = 0.0298
+offset = 0.0298

source/figure/rir/rir.toml

@@ -1,42 +1,36 @@
 [body]
-cast = [
-    {name = "rir_z1a0200", rate = 0.363},
-    {name = "rir_z1b0200", rate = 0.389},
-    {name = "rir_z1b0210", rate = 0.389},
-    {name = "rir_noa0200", rate = 0.363},
-    {name = "rir_nob0200", rate = 0.386},
-]
+rir_z1a0200 = 0.363
+rir_z1b0200 = 0.389
+rir_z1b0210 = 0.389
+rir_noa0200 = 0.363
+rir_nob0200 = 0.386
 
 [face]
-cast = [
-    {name = "z1a0050", x = 0.343, y = 0.0507},
-    {name = "z1a0043", x = 0.337, y = 0.0808},
-    {name = "z1a0049", x = 0.339, y = 0.0838},
-    {name = "z1b0058", x = 0.332, y = 0.0728},
-    {name = "z1b0059", x = 0.327, y = 0.0757},
-    {name = "z1b0050", x = 0.337, y = 0.0530},
-    {name = "z1a0002", x = 0.328, y = 0.0784},
-    {name = "z1a0009", x = 0.326, y = 0.0735},
-    {name = "z1a0038", x = 0.334, y = 0.0814},
-    {name = "z1a0039", x = 0.337, y = 0.0804},
-    {name = "z1a0050", x = 0.343, y = 0.0507},
-    {name = "z1a0052", x = 0.330, y = 0.0764},
-    {name = "z1b0050", x = 0.337, y = 0.0530},
-    {name = "z1b0008", x = 0.318, y = 0.0655},
-    {name = "z1b0010", x = 0.318, y = 0.0664},
-    {name = "z1b0012", x = 0.332, y = 0.0758},
-    {name = "z1b0031", x = 0.332, y = 0.0817},
-    {name = "noa0002", x = 0.328, y = 0.0793},
-    {name = "noa0009", x = 0.325, y = 0.0733},
-    {name = "noa0038", x = 0.332, y = 0.0819},
-    {name = "noa0039", x = 0.335, y = 0.0810},
-    {name = "noa0050", x = 0.343, y = 0.0507},
-    {name = "noa0052", x = 0.330, y = 0.0776},
-    {name = "nob0050", x = 0.337, y = 0.0530},
-    {name = "nob0008", x = 0.319, y = 0.0655},
-    {name = "nob0010", x = 0.319, y = 0.0655},
-    {name = "nob0031", x = 0.335, y = 0.0810},
-]
+z1a0050 = [0.343, 0.0507]
+z1a0043 = [0.337, 0.0808]
+z1a0049 = [0.339, 0.0838]
+z1b0058 = [0.332, 0.0728]
+z1b0059 = [0.327, 0.0757]
+z1b0050 = [0.337, 0.0530]
+z1a0002 = [0.328, 0.0784]
+z1a0009 = [0.326, 0.0735]
+z1a0038 = [0.334, 0.0814]
+z1a0039 = [0.337, 0.0804]
+z1a0052 = [0.330, 0.0764]
+z1b0008 = [0.318, 0.0655]
+z1b0010 = [0.318, 0.0664]
+z1b0012 = [0.332, 0.0758]
+z1b0031 = [0.332, 0.0817]
+noa0002 = [0.328, 0.0793]
+noa0009 = [0.325, 0.0733]
+noa0038 = [0.332, 0.0819]
+noa0039 = [0.335, 0.0810]
+noa0050 = [0.343, 0.0507]
+noa0052 = [0.330, 0.0776]
+nob0050 = [0.337, 0.0530]
+nob0008 = [0.319, 0.0655]
+nob0010 = [0.319, 0.0655]
+nob0031 = [0.335, 0.0810]
 
 [offset]
-offset = 0.0
+offset = 0.0

source/voice/rar/length.toml

@@ -1,4 +1,3 @@
-cast = [
-    {name = "fem_rar_50055", length = 4},
-    {name = "fem_rar_50056", length = 6},
-]
+[cast]
+fem_rar_50055 = 4
+fem_rar_50056 = 6

source/voice/rir/length.toml

@@ -1,10 +1,9 @@
-cast = [
-    {name = "fem_rir_50236", length = 2},
-    {name = "fem_rir_50237", length = 10},
-    {name = "fem_rir_50238", length = 10},
-    {name = "fem_rir_50239", length = 3},
-    {name = "fem_rir_50240", length = 6},
-    {name = "fem_rir_50520", length = 11},
-    {name = "fem_rir_50521", length = 11},
-    {name = "fem_rir_50522", length = 9},
-]
+[cast]
+fem_rir_50236 = 2
+fem_rir_50237 = 10
+fem_rir_50238 = 10
+fem_rir_50239 = 3
+fem_rir_50240 = 6
+fem_rir_50520 = 11
+fem_rir_50521 = 11
+fem_rir_50522 = 9

src/config/cg.rs

@@ -3,38 +3,22 @@ use crate::error::{EngineError, ExecutorError};
 use crate::ui::initialize::ExItem;
 use serde::{Deserialize, Serialize};
 use slint::{Image, ModelRc, VecModel};
-use std::{cell::RefCell, path::Path, rc::Rc};
 use std::{collections::HashMap, fs};
+use std::{path::Path, rc::Rc};
 
 lazy_static::lazy_static! {
     pub(crate) static ref CG_CONFIG: CgConfig = load_cg();
 }
 
-#[derive(Debug, Deserialize, Serialize)]
-pub(crate) struct CgMap {
-    cg: Vec<u64>,
-}
-
-impl CgMap {
-    pub(crate) fn new(cg: Vec<u64>) -> Self {
-        Self { cg }
-    }
-
-    pub(crate) fn cg(self) -> Vec<u64> {
-        self.cg
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct Length {
-    name: String,
+#[derive(Debug, Deserialize)]
+struct CgEntry {
     index: usize,
     length: u64,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize)]
 struct LengthWrapper {
-    cast: Vec<Length>,
+    cast: HashMap<String, CgEntry>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -59,27 +43,23 @@ impl CgConfig {
 }
 
 fn load_cg() -> CgConfig {
-    let content = fs::read_to_string(format!("{}length.toml", ENGINE_CONFIG.cg_path(),)).unwrap();
-    let name_item: LengthWrapper = toml::from_str(&content).unwrap();
-    let index_item = name_item.cast.clone();
-    let length = index_item.len();
+    let content = fs::read_to_string(format!("{}length.toml", ENGINE_CONFIG.cg_path())).unwrap();
+    let item: LengthWrapper = toml::from_str(&content).unwrap();
+    let length = item.cast.len();
+    let mut cg_by_name = HashMap::new();
+    let mut cg_by_id = HashMap::new();
+    for (name, entry) in item.cast {
+        cg_by_name.insert(name.clone(), (entry.index, entry.length));
+        cg_by_id.insert(entry.index, (name, entry.length));
+    }
     CgConfig {
-        cg_by_name: name_item
-            .cast
-            .into_iter()
-            .map(|length| (length.name, (length.index, length.length)))
-            .collect(),
-        cg_by_id: index_item
-            .into_iter()
-            .map(|length| (length.index, (length.name, length.length)))
-            .collect(),
+        cg_by_name,
+        cg_by_id,
         length,
     }
 }
 
-pub(crate) fn get_cg(cg: Rc<RefCell<Vec<u64>>>) -> Result<ModelRc<ModelRc<ExItem>>, EngineError> {
-    let cg_map = cg.borrow();
-
+pub(crate) fn get_cg(cg_map: &[u64]) -> Result<ModelRc<ModelRc<ExItem>>, EngineError> {
     let mut ex_items: Vec<ModelRc<ExItem>> = Vec::with_capacity(10);
     let mut i = 1;
     let mut ex_page: Vec<ExItem> = Vec::new();