rust/sbv2-api
1
0
Fork 0
mirror of https://github.com/neodyland/sbv2-api.git synced 2025-12-22 23:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from neodyland/main

Browse Source 
merge
This commit is contained in:
tuna2134
2025-07-21 11:42:01 +09:00
committed by GitHub
parent 7faba2447b 98ddaa3c58
commit 2fc547e38b
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/sbv2_api/Cargo.toml
View File

@@ -16,7 +16,7 @@ env_logger.workspace = true
log = "0.4.22"
sbv2_core = { version = "0.2.0-alpha6", path = "../sbv2_core", features = ["aivmx"] }
serde = { version = "1.0.210", features = ["derive"] }
tokio = { version = "1.45.1", features = ["full"] }
tokio = { version = "1.46.1", features = ["full"] }
utoipa = { version = "5.4.0", features = ["axum_extras"] }
utoipa-scalar = { version = "0.3.0", features = ["axum"] }

23
crates/sbv2_core/src/jtalk.rs
View File

@@ -123,7 +123,7 @@ impl JTalkProcess {
.map(|(_letter, tone)| *tone)
.collect();
if tone_values.len() == 1 {
assert!(tone_values == hash_set![0], "{:?}", tone_values);
assert!(tone_values == hash_set![0], "{tone_values:?}");
Ok(phone_tone_list)
} else if tone_values.len() == 2 {
if tone_values == hash_set![0, 1] {
@@ -226,12 +226,12 @@ impl JTalkProcess {
} else if PUNCTUATIONS.contains(&phone.as_str()) {
result.push((phone, 0));
} else {
println!("phones {:?}", phone_with_punct);
println!("phone_tone_list: {:?}", phone_tone_list);
println!("result: {:?}", result);
println!("tone_index: {:?}", tone_index);
println!("phone: {:?}", phone);
return Err(Error::ValueError(format!("Mismatched phoneme: {}", phone)));
println!("phones {phone_with_punct:?}");
println!("phone_tone_list: {phone_tone_list:?}");
println!("result: {result:?}");
println!("tone_index: {tone_index:?}");
println!("phone: {phone:?}");
return Err(Error::ValueError(format!("Mismatched phoneme: {phone}")));
}
}
@@ -276,8 +276,7 @@ impl JTalkProcess {
}
if !KATAKANA_PATTERN.is_match(&text) {
return Err(Error::ValueError(format!(
"Input must be katakana only: {}",
text
"Input must be katakana only: {text}"
)));
}
@@ -285,7 +284,7 @@ impl JTalkProcess {
let mora = mora.to_string();
let (consonant, vowel) = MORA_KATA_TO_MORA_PHONEMES.get(&mora).unwrap();
if consonant.is_none() {
text = text.replace(&mora, &format!(" {}", vowel));
text = text.replace(&mora, &format!(" {vowel}"));
} else {
text = text.replace(
&mora,
@@ -319,7 +318,7 @@ impl JTalkProcess {
let (string, pron) = self.parse_to_string_and_pron(parts.clone());
let mut yomi = pron.replace('’', "");
let word = replace_punctuation(string);
assert!(!yomi.is_empty(), "Empty yomi: {}", word);
assert!(!yomi.is_empty(), "Empty yomi: {word}");
if yomi == "、" {
if !word
.chars()
@@ -330,7 +329,7 @@ impl JTalkProcess {
yomi = word.clone();
}
} else if yomi == "？" {
assert!(word == "?", "yomi `？` comes from: {}", word);
assert!(word == "?", "yomi `？` comes from: {word}");
yomi = "?".to_string();
}
seq_text.push(word);