StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(startup): rename to STARTUP_SETTINGS

Browse Source
This commit is contained in:
Nova
2022-12-10 09:27:37 -05:00
parent 9f5ad2b9af
commit 697320d1c0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/client.rs
View File

@@ -5,7 +5,7 @@ use crate::{
data, drawable, fields, hmd, input, items, data, drawable, fields, hmd, input, items,
root::Root, root::Root,
spatial, spatial,
startup::{self, StartupSettings, DESKTOP_STARTUP_IDS}, startup::{self, StartupSettings, STARTUP_SETTINGS},
Node, Node,
}, },
}; };
@@ -55,10 +55,8 @@ pub fn get_env(pid: i32) -> Result<FxHashMap<String, String>, std::io::Error> {
)) ))
} }
pub fn startup_settings(env: &FxHashMap<String, String>) -> Option<StartupSettings> { pub fn startup_settings(env: &FxHashMap<String, String>) -> Option<StartupSettings> {
DESKTOP_STARTUP_IDS let token = env.get("STARDUST_STARTUP_TOKEN")?;
.lock() STARTUP_SETTINGS.lock().get(token).cloned()
.get(env.get("STARDUST_STARTUP_TOKEN")?)
.cloned()
} }
pub struct Client { pub struct Client {

4
src/nodes/startup.rs
View File

@@ -16,7 +16,7 @@ use std::{
}; };
lazy_static::lazy_static! { lazy_static::lazy_static! {
pub static ref DESKTOP_STARTUP_IDS: Mutex<FxHashMap<String, StartupSettings>> = Default::default(); pub static ref STARTUP_SETTINGS: Mutex<FxHashMap<String, StartupSettings>> = Default::default();
} }
#[derive(Default, Clone)] #[derive(Default, Clone)]
@@ -61,7 +61,7 @@ impl StartupSettings {
) -> Result<Vec<u8>> { ) -> Result<Vec<u8>> {
let id = nanoid::nanoid!(); let id = nanoid::nanoid!();
let data = serialize(&id)?; let data = serialize(&id)?;
DESKTOP_STARTUP_IDS STARTUP_SETTINGS
.lock() .lock()
.insert(id, node.startup_settings.get().unwrap().lock().clone()); .insert(id, node.startup_settings.get().unwrap().lock().clone());
Ok(data) Ok(data)