refactor: deduplicate packaged webui error helpers

Author: zouyonghe

src-tauri/src/main.rs

@@ -2194,26 +2194,31 @@ fn packaged_fallback_webui_dir(root_dir: Option<&Path>) -> Option<PathBuf> {
     }
 }
 
-fn packaged_webui_missing_embedded_error(locale: &str, embedded_index: &Path) -> String {
-    if locale == "en-US" {
-        return format!(
-            "Packaged WebUI is unavailable. Missing embedded index at {} and fallback data/dist. Please reinstall AstrBot or download the matching dist.zip to data/dist.",
-            embedded_index.display()
-        );
-    }
-
-    format!(
-        "内置 WebUI 不可用。缺少内置入口文件：{}，且回退目录 data/dist 也不可用。请重装 AstrBot，或下载匹配版本的 dist.zip 到 data/dist。",
-        embedded_index.display()
-    )
+fn packaged_fallback_webui_index_display(root_dir: Option<&Path>) -> String {
+    packaged_fallback_webui_probe_dir(root_dir)
+        .map(|path| path.join("index.html").display().to_string())
+        .unwrap_or_else(|| "<unresolved>".to_string())
 }
 
-fn packaged_webui_missing_embedded_dir_error(locale: &str) -> String {
+fn packaged_webui_unavailable_error(locale: &str, embedded_index: Option<&Path>) -> String {
     if locale == "en-US" {
+        if let Some(index) = embedded_index {
+            return format!(
+                "Packaged WebUI is unavailable. Missing embedded index at {} and fallback data/dist. Please reinstall AstrBot or download the matching dist.zip to data/dist.",
+                index.display()
+            );
+        }
         return "Packaged WebUI directory is missing and fallback data/dist is unavailable. Please reinstall AstrBot or download the matching dist.zip to data/dist."
             .to_string();
     }
 
+    if let Some(index) = embedded_index {
+        return format!(
+            "内置 WebUI 不可用。缺少内置入口文件：{}，且回退目录 data/dist 也不可用。请重装 AstrBot，或下载匹配版本的 dist.zip 到 data/dist。",
+            index.display()
+        );
+    }
+
     "内置 WebUI 目录缺失，且回退目录 data/dist 也不可用。请重装 AstrBot，或下载匹配版本的 dist.zip 到 data/dist。".to_string()
 }
 
@@ -2223,8 +2228,6 @@ fn resolve_packaged_webui_dir(
 ) -> Result<PathBuf, String> {
     let locale = resolve_shell_locale();
     let fallback_webui_dir = packaged_fallback_webui_dir(root_dir);
-    let fallback_index_path = packaged_fallback_webui_probe_dir(root_dir)
-        .map(|path| path.join("index.html").display().to_string());
 
     match embedded_webui_dir {
         Some(candidate) => {
@@ -2246,16 +2249,16 @@ fn resolve_packaged_webui_dir(
                 return Ok(fallback);
             }
 
-            let fallback_index = fallback_index_path.unwrap_or_else(|| "<unresolved>".to_string());
+            let fallback_index = packaged_fallback_webui_index_display(root_dir);
             append_desktop_log(&format!(
                 "packaged webui resolution failed: embedded index missing at {}, fallback index missing at {}",
                 embedded_index.display(),
                 fallback_index
             ));
 
-            Err(packaged_webui_missing_embedded_error(
+            Err(packaged_webui_unavailable_error(
                 locale,
-                &embedded_index,
+                Some(&embedded_index),
             ))
         }
         None => {
@@ -2267,13 +2270,13 @@ fn resolve_packaged_webui_dir(
                 return Ok(fallback);
             }
 
-            let fallback_index = fallback_index_path.unwrap_or_else(|| "<unresolved>".to_string());
+            let fallback_index = packaged_fallback_webui_index_display(root_dir);
             append_desktop_log(&format!(
                 "packaged webui resolution failed: embedded webui directory is missing, fallback index missing at {}",
                 fallback_index
             ));
 
-            Err(packaged_webui_missing_embedded_dir_error(locale))
+            Err(packaged_webui_unavailable_error(locale, None))
         }
     }
 }