Merge main

This commit is contained in:
SpikeHD
2022-07-13 18:22:10 -07:00
4 changed files with 6197 additions and 6296 deletions

View File

@@ -5,7 +5,6 @@ windows_subsystem = "windows"
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::{sync::Mutex, collections::HashMap}; use std::{sync::Mutex, collections::HashMap};
use std::path::PathBuf;
use std::thread; use std::thread;
use sysinfo::{System, SystemExt}; use sysinfo::{System, SystemExt};

View File

@@ -1,11 +1,11 @@
use duct::cmd; use duct::cmd;
use crate::file_helpers;
#[tauri::command] #[tauri::command]
pub fn run_program(path: String) { pub fn run_program(path: String) {
// Open the program from the specified path. // Open in new thread to prevent blocking.
open::that(&path).unwrap(); std::thread::spawn(move || {
open::that(&path).unwrap();
});
} }
#[tauri::command] #[tauri::command]

View File

@@ -18,7 +18,7 @@ export async function toggleEncryption(path: string) {
// Write file // Write file
await fs.writeFile({ await fs.writeFile({
path, path,
contents: JSON.stringify(serverConf) contents: JSON.stringify(serverConf, null, 2),
}) })
} }

12482
yarn.lock

File diff suppressed because it is too large Load Diff