mirrors/envision
1
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-04-20 19:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: stop user from importing survive calibration if survive-cli for profile isn't found

Browse source
This commit is contained in:
Gabriele Musco 2023-07-14 07:50:51 +02:00
parent 6068263d9d
commit 4b95a22045
2 changed files with 59 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/profile.rs
View file

@ -3,7 +3,7 @@ use crate::{
paths::{data_monado_path, data_opencomposite_path, BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX},
};
use serde::{Deserialize, Serialize};
use std::{collections::HashMap, fmt::Display, fs::File, io::BufReader, slice::Iter};
use std::{collections::HashMap, fmt::Display, fs::File, io::BufReader, slice::Iter, path::Path};
use uuid::Uuid;
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@ -200,6 +200,17 @@ impl Profile {
.join(" ")
}
pub fn get_survive_cli_path(&self) -> Option<String> {
let path_s = format!(
"{pfx}/bin/survive-cli",
pfx = self.prefix
);
if Path::new(&path_s).is_file() {
return Some(path_s);
}
None
}
pub fn load_profile(path: &String) -> Self {
let file = File::open(path).expect("Unable to open profile");
let reader = BufReader::new(file);

70
src/ui/libsurvive_setup_window.rs
View file

@ -1,6 +1,7 @@
use crate::{profile::Profile, runner::Runner};
use gtk::{glib, prelude::*};
use relm4::prelude::*;
use adw::prelude::*;
use std::{cell::Cell, collections::HashMap, path::Path, rc::Rc, time::Duration};
const NO_FILE_MSG: &str = "(No file selected)";
@ -27,6 +28,9 @@ pub struct LibsurviveSetupWindow {
#[tracker::do_not_track]
filefilter_listmodel: gtk::gio::ListStore,
#[tracker::do_not_track]
survive_cli_not_found_dialog: adw::MessageDialog,
#[tracker::do_not_track]
calibration_running: Rc<Cell<bool>>,
#[tracker::do_not_track]
@ -51,7 +55,7 @@ pub enum LibsurviveSetupMsg {
}
impl LibsurviveSetupWindow {
fn create_calibration_runner(&mut self) -> Runner {
fn create_calibration_runner(&mut self, survive_cli_path: String) -> Runner {
let lh_path = self.steam_lighthouse_path.clone();
let mut env = HashMap::new();
env.insert(
@ -60,10 +64,7 @@ impl LibsurviveSetupWindow {
);
Runner::new(
Some(env),
format!(
"{pfx}/bin/survive-cli",
pfx = self.profile.as_ref().unwrap().prefix
),
survive_cli_path,
vec!["--steamvr-calibration".into(), lh_path],
)
}
@ -366,24 +367,29 @@ impl SimpleComponent for LibsurviveSetupWindow {
let path_s = self.steam_lighthouse_path.clone();
let lh_path = Path::new(&path_s);
if lh_path.is_file() {
let mut runner = self.create_calibration_runner();
self.calibration_running.set(true);
self.first_run_done = false;
self.calibration_seconds_elapsed = 0.0;
runner.start();
{
let timer_sender = sender.clone();
let cont = self.calibration_running.clone();
glib::timeout_add_local(Duration::from_millis(1000), move || {
timer_sender.input(LibsurviveSetupMsg::TickCalibrationRunner);
return glib::Continue(cont.get());
});
let survive_cli_path = self.profile.as_ref().unwrap().get_survive_cli_path();
if survive_cli_path.is_some() {
let mut runner = self.create_calibration_runner(survive_cli_path.unwrap());
self.calibration_running.set(true);
self.first_run_done = false;
self.calibration_seconds_elapsed = 0.0;
runner.start();
{
let timer_sender = sender.clone();
let cont = self.calibration_running.clone();
glib::timeout_add_local(Duration::from_millis(1000), move || {
timer_sender.input(LibsurviveSetupMsg::TickCalibrationRunner);
return glib::Continue(cont.get());
});
}
self.calibration_runner = Some(runner);
self.carousel
.as_ref()
.unwrap()
.scroll_to(self.loading_page.as_ref().unwrap(), true);
} else {
self.survive_cli_not_found_dialog.present();
}
self.calibration_runner = Some(runner);
self.carousel
.as_ref()
.unwrap()
.scroll_to(self.loading_page.as_ref().unwrap(), true);
}
}
Self::Input::SetSteamLighthousePath(n_path) => {
@ -427,7 +433,9 @@ impl SimpleComponent for LibsurviveSetupWindow {
self.first_run_done = true;
let runner = self.calibration_runner.as_mut().unwrap();
runner.terminate();
let mut n_runner = self.create_calibration_runner();
let mut n_runner = self.create_calibration_runner(
self.profile.as_ref().unwrap().get_survive_cli_path().unwrap(),
);
n_runner.start();
self.calibration_runner = Some(n_runner);
}
@ -469,6 +477,18 @@ impl SimpleComponent for LibsurviveSetupWindow {
) -> relm4::ComponentParts<Self> {
let json_filter = gtk::FileFilter::new();
json_filter.add_mime_type("application/json");
let survive_cli_not_found_dialog = adw::MessageDialog::builder()
.modal(true)
.hide_on_close(true)
.heading("Survive CLI not found")
.body(concat!(
"You might need to build this profile first, ",
"or maybe Libsurvive isn't enabled for this profile"
))
.build();
survive_cli_not_found_dialog.add_response("ok", "_Ok");
let mut model = LibsurviveSetupWindow {
win: None,
progressbar: None,
@ -486,6 +506,7 @@ impl SimpleComponent for LibsurviveSetupWindow {
calibration_running: Rc::new(Cell::new(false)),
first_run_done: false,
calibration_seconds_elapsed: 0.0,
survive_cli_not_found_dialog,
tracker: 0,
};
@ -494,6 +515,9 @@ impl SimpleComponent for LibsurviveSetupWindow {
let widgets = view_output!();
model.win = Some(widgets.win.clone());
model
.survive_cli_not_found_dialog
.set_transient_for(Some(model.win.as_ref().unwrap()));
model.progressbar = Some(widgets.progressbar.clone());
model.carousel = Some(widgets.carousel.clone());
model.loading_page = Some(widgets.loading_page.clone());