ddidderr/lanspread
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

[code] Mutex -> RwLock

Browse Source
This commit is contained in:
ddidderr
2025-06-25 21:16:39 +02:00
parent f16d8b1dca
commit 8fda4f79ed
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
crates/lanspread-tauri-deno-ts/src-tauri/src/lib.rs
View File

@ -11,16 +11,16 @@ use lanspread_db::db::{Game, GameDB};
use lanspread_mdns::{LANSPREAD_INSTANCE_NAME, LANSPREAD_SERVICE_TYPE, discover_service};
use tauri::{AppHandle, Emitter as _, Manager};
use tauri_plugin_shell::{ShellExt, process::Command};
use tokio::sync::{Mutex, mpsc::UnboundedSender};
use tokio::sync::{Mutex, RwLock, mpsc::UnboundedSender};
// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
struct LanSpreadState {
server_addr: Mutex<Option<SocketAddr>>,
server_addr: RwLock<Option<SocketAddr>>,
client_ctrl: UnboundedSender<ClientCommand>,
games: Arc<Mutex<GameDB>>,
games: Arc<RwLock<GameDB>>,
games_in_download: Arc<Mutex<HashSet<String>>>,
games_folder: Arc<Mutex<String>>,
games_folder: Arc<RwLock<String>>,
}
#[tauri::command]
@ -85,7 +85,7 @@ fn run_game_windows(id: String, state: tauri::State<LanSpreadState>) {
const FIRST_START_DONE_FILE: &str = ".softlan_first_start_done";
let games_folder =
tauri::async_runtime::block_on(async { state.inner().games_folder.lock().await.clone() });
tauri::async_runtime::block_on(async { state.inner().games_folder.read().await.clone() });
let games_folder = PathBuf::from(games_folder);
if !games_folder.exists() {
@ -180,7 +180,7 @@ fn update_game_directory(app_handle: tauri::AppHandle, path: String) {
.state::<LanSpreadState>()
.inner()
.games_folder
.lock()
.write()
.await;
*games_folder = path.clone();
@ -205,7 +205,7 @@ fn update_game_directory(app_handle: tauri::AppHandle, path: String) {
.state::<LanSpreadState>()
.inner()
.games
.lock()
.write()
.await;
// Reset all games to uninstalled
@ -239,11 +239,7 @@ async fn find_server(app: AppHandle) {
Ok(server_addr) => {
log::info!("Found server at {server_addr}");
let state: tauri::State<LanSpreadState> = app.state();
{
// mutex scope
let mut addr = state.server_addr.lock().await;
*addr = Some(server_addr);
}
*state.server_addr.write().await = Some(server_addr);
state
.client_ctrl
.send(ClientCommand::ServerAddr(server_addr))
@ -266,8 +262,7 @@ async fn update_game_db(games: Vec<Game>, app: AppHandle) {
let state = app.state::<LanSpreadState>();
// Store games list
let mut state_games = state.games.lock().await;
*state_games = GameDB::from(games.clone());
*state.games.write().await = GameDB::from(games.clone());
// Tell Frontend about new games list
if let Err(e) = app.emit("games-list-updated", Some(games)) {
@ -361,11 +356,11 @@ pub fn run() {
tokio::sync::mpsc::unbounded_channel::<ClientEvent>();
let lanspread_state = LanSpreadState {
server_addr: Mutex::new(None),
server_addr: RwLock::new(None),
client_ctrl: tx_client_control,
games: Arc::new(Mutex::new(GameDB::empty())),
games: Arc::new(RwLock::new(GameDB::empty())),
games_in_download: Arc::new(Mutex::new(HashSet::new())),
games_folder: Arc::new(Mutex::new("".to_string())),
games_folder: Arc::new(RwLock::new("".to_string())),
};
tauri::Builder::default()
@ -451,7 +446,7 @@ pub fn run() {
.state::<LanSpreadState>()
.inner()
.games_folder
.lock()
.read()
.await
.clone();