mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-07-30 20:58:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: split cmake var into name and value when it contains =
Some checks failed
/ cargo-fmtcheck (push) Has been cancelled
Details
/ cargo-clippy (push) Has been cancelled
Details
/ cargo-test (push) Has been cancelled
Details
/ appimage (push) Has been cancelled
Details

Browse source
This commit is contained in:
Gabriele Musco 2024-11-18 13:39:11 +01:00
commit af5c57f0f8
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/ui/profile_editor.rs
View file

@ -48,6 +48,21 @@ pub struct ProfileEditorInit {
pub profile: Profile, pub profile: Profile,
} }
/// This parses a var (either env var or cmake var) and if it contains
/// a '=' char, it assumes it's key and value, otherwise it's just going to
/// be the key and the value is gonna be an empty string
fn parse_var(input: &str) -> (String, String) {
if input.contains('=') {
let mut sp = input.split('=');
(
sp.next().unwrap().to_string(),
sp.next().unwrap().to_string(),
)
} else {
(input.to_string(), "".to_string())
}
}
#[relm4::component(pub)] #[relm4::component(pub)]
impl SimpleComponent for ProfileEditor { impl SimpleComponent for ProfileEditor {
type Init = ProfileEditorInit; type Init = ProfileEditorInit;
@ -428,33 +443,23 @@ impl SimpleComponent for ProfileEditor {
} }
Self::Input::AddEnvVar(var) => { Self::Input::AddEnvVar(var) => {
let mut prof = self.profile.borrow_mut(); let mut prof = self.profile.borrow_mut();
if !prof.environment.contains_key(&var) { let (name, value) = parse_var(&var);
let (name, value) = if var.contains('=') { if !prof.environment.contains_key(&name) {
let mut sp = var.split('=');
(
sp.next().unwrap().to_string(),
sp.next().unwrap().to_string(),
)
} else {
(var, "".to_string())
};
prof.environment.insert(name.clone(), value.clone()); prof.environment.insert(name.clone(), value.clone());
self.env_rows self.env_rows
.guard() .guard()
.push_back(EnvVarModelInit { name, value }); .push_back(EnvVarModelInit { name, value });
} }
} }
Self::Input::AddXrServiceCmakeFlag(name) => { Self::Input::AddXrServiceCmakeFlag(var) => {
let mut prof = self.profile.borrow_mut(); let mut prof = self.profile.borrow_mut();
let (name, value) = parse_var(&var);
if !prof.xrservice_cmake_flags.contains_key(&name) { if !prof.xrservice_cmake_flags.contains_key(&name) {
prof.xrservice_cmake_flags prof.xrservice_cmake_flags
.insert(name.clone(), "".to_string()); .insert(name.clone(), value.clone());
self.xrservice_cmake_flags_rows self.xrservice_cmake_flags_rows
.guard() .guard()
.push_back(EnvVarModelInit { .push_back(EnvVarModelInit { name, value });
name,
value: "".to_string(),
});
} }
} }
} }