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

Merge pull request #143 from ariqpradipa/src-tauri/src/lang

Browse Source 
Refactor path concatenation and make error handling src-tauri/src/lang.rs
This commit is contained in:
SpikeHD
2023-04-04 08:29:21 -07:00
committed by GitHub
parent 78c2a8d0c8 b66f01232b
commit bbd18d33e9
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 std::path::{Path, PathBuf};
use std::path::{ Path, PathBuf };
#[tauri::command]
pub async fn get_lang(window: tauri::Window, lang: String) -> String {
@@ -28,7 +28,12 @@ pub async fn get_languages() -> std::collections::HashMap<String, String> {
for entry in lang_files {
let entry = entry.unwrap();
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) {
Ok(x) => x,
@@ -50,4 +55,4 @@ pub fn emit_lang_err(window: tauri::Window, msg: String) {
res_hash.insert("error".to_string(), msg);
window.emit("lang_error", &res_hash).unwrap();
}
}