Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expand vars in paths

Browse Source
This commit is contained in:
galister
2026-01-15 20:47:37 +09:00
parent e4caa1d6d4
commit b67914b956
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wayvr/src/overlays/custom.rs
View File

@@ -4,7 +4,7 @@ use std::{
}; };
use glam::{Affine3A, Quat, Vec3, vec3}; use glam::{Affine3A, Quat, Vec3, vec3};
use regex::Regex; use wgui::globals::expand_env_vars;
use wlx_common::{ use wlx_common::{
overlays::{BackendAttrib, BackendAttribValue}, overlays::{BackendAttrib, BackendAttribValue},
windowing::OverlayWindowState, windowing::OverlayWindowState,
@@ -22,21 +22,6 @@ use crate::{
}, },
}; };
static ENV_VAR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
Regex::new(r"\$\{([A-Z_][A-Z0-9_]*)}|\$([A-Z_][A-Z0-9_]*)").unwrap() // want panic
});
pub(super) fn expand_env_vars(template: &str) -> String {
ENV_VAR_REGEX
.replace_all(template, |caps: &regex::Captures| {
let var_name = caps.get(1).or_else(|| caps.get(2)).unwrap().as_str();
std::env::var(var_name)
.inspect_err(|e| log::warn!("Unable to substitute env var {var_name}: {e:?}"))
.unwrap_or_default()
})
.into_owned()
}
struct CustomPanelState; struct CustomPanelState;
pub fn create_custom(app: &mut AppState, name: Arc<str>) -> Option<OverlayWindowConfig> { pub fn create_custom(app: &mut AppState, name: Arc<str>) -> Option<OverlayWindowConfig> {

18
wgui/src/globals.rs
View File

@@ -3,9 +3,11 @@ use std::{
io::Read, io::Read,
path::PathBuf, path::PathBuf,
rc::Rc, rc::Rc,
sync::LazyLock,
}; };
use anyhow::Context; use anyhow::Context;
use regex::Regex;
use crate::{ use crate::{
assets::{AssetPath, AssetProvider}, assets::{AssetPath, AssetProvider},
@@ -93,6 +95,7 @@ impl WguiGlobals {
} }
fn load_asset_from_fs(&self, path: &str) -> anyhow::Result<Vec<u8>> { fn load_asset_from_fs(&self, path: &str) -> anyhow::Result<Vec<u8>> {
let path = expand_env_vars(path);
let path = self.0.borrow().asset_folder.join(path); let path = self.0.borrow().asset_folder.join(path);
let mut file = let mut file =
std::fs::File::open(path.as_path()).with_context(|| format!("Could not open asset from {}", path.display()))?; std::fs::File::open(path.as_path()).with_context(|| format!("Could not open asset from {}", path.display()))?;
@@ -136,3 +139,18 @@ impl WguiGlobals {
RefMut::map(self.0.borrow_mut(), |x| &mut x.font_system) RefMut::map(self.0.borrow_mut(), |x| &mut x.font_system)
} }
} }
static ENV_VAR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
Regex::new(r"\$\{([A-Z_][A-Z0-9_]*)}|\$([A-Z_][A-Z0-9_]*)").unwrap() // want panic
});
pub fn expand_env_vars(template: &str) -> String {
ENV_VAR_REGEX
.replace_all(template, |caps: &regex::Captures| {
let var_name = caps.get(1).or_else(|| caps.get(2)).unwrap().as_str();
std::env::var(var_name)
.inspect_err(|e| log::warn!("Unable to substitute env var {var_name}: {e:?}"))
.unwrap_or_default()
})
.into_owned()
}