Fix: 起動直後は辞書が反映されないのを修正

sevenc-nanashi · Nov 18, 2023 · 1042543 · 1042543
1 parent fbd9690
commit 1042543
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -9,6 +9,8 @@ mod voicevox;
 
 use crate::aivoice::AIVOICE;
 use crate::icon_manager::ICON_MANAGER;
+use crate::routes::audio_query::OPEN_JTALK;
+use crate::routes::user_dict::USER_DICT;
 
 use anyhow::Result;
 use axum::{
@@ -121,6 +123,11 @@ async fn main_impl(args: Cli) -> Result<()> {
 
     info!("Starting server...");
 
+    {
+        let open_jtalk = OPEN_JTALK.lock().await;
+        let user_dict = USER_DICT.lock().await;
+        open_jtalk.use_user_dict(&user_dict)?;
+    }
     info!("Listening on port {}", port);
 
     axum::Server::bind(&addr)

diff --git a/src/routes/user_dict.rs b/src/routes/user_dict.rs
@@ -11,7 +11,7 @@ use tracing::warn;
 
 use crate::error::{Error, Result};
 
-static USER_DICT: Lazy<Arc<Mutex<UserDict>>> = Lazy::new(|| {
+pub static USER_DICT: Lazy<Arc<Mutex<UserDict>>> = Lazy::new(|| {
     let mut user_dict = UserDict::new();
 
     if std::fs::metadata(&*USER_DICT_PATH).is_ok() {
@@ -21,7 +21,7 @@ static USER_DICT: Lazy<Arc<Mutex<UserDict>>> = Lazy::new(|| {
     Arc::new(Mutex::new(user_dict))
 });
 
-static USER_DICT_PATH: Lazy<String> = Lazy::new(|| {
+pub static USER_DICT_PATH: Lazy<String> = Lazy::new(|| {
     process_path::get_executable_path()
         .unwrap()
         .parent()