Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-16 09:04:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve error handling in get_languages()

Browse Source
This commit is contained in:
Ariq Pradipa Santoso
2023-04-04 01:09:54 +07:00
parent 45ee8fbb23
commit b6a2e4dbc0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-tauri/src/lang.rs
View File

@@ -1,5 +1,5 @@
use crate::system_helpers::*; use crate::system_helpers::*;
use std::path::{Path, PathBuf}; use std::path::{ Path, PathBuf };
#[tauri::command] #[tauri::command]
pub async fn get_lang(window: tauri::Window, lang: String) -> String { pub async fn get_lang(window: tauri::Window, lang: String) -> String {
@@ -27,7 +27,12 @@ pub async fn get_languages() -> std::collections::HashMap<String, String> {
for entry in lang_files { for entry in lang_files {
let entry = entry.unwrap(); let entry = entry.unwrap();
let path = entry.path(); let path = entry.path();
let filename = path.file_name().unwrap().to_str().unwrap(); let filename = path
.file_name()
.unwrap_or_else(|| panic!("Failed to get filename from path: {:?}", path))
.to_str()
.unwrap_or_else(|| panic!("Failed to convert filename to string: {:?}", path))
.to_string();
let content = match std::fs::read_to_string(&path) { let content = match std::fs::read_to_string(&path) {
Ok(x) => x, Ok(x) => x,
@@ -49,4 +54,4 @@ pub fn emit_lang_err(window: tauri::Window, msg: String) {
res_hash.insert("error".to_string(), msg); res_hash.insert("error".to_string(), msg);
window.emit("lang_error", &res_hash).unwrap(); window.emit("lang_error", &res_hash).unwrap();
} }