Skip to content

Commit 28f1501

Browse files
committed
gsdtool: Catch new results from PrmBuilder
For now just panic, this will need to be improved in the future.
1 parent a902ee4 commit 28f1501

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

gsdtool/src/main.rs

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
7878
println!();
7979

8080
println!("{}", style("Global parameters:").bold());
81-
let mut prm = gsd_parser::PrmBuilder::new(&gsd.user_prm_data);
81+
let mut prm = gsd_parser::PrmBuilder::new(&gsd.user_prm_data).expect("TODO");
8282
let mut global_parameters = vec![];
8383
let mut had_parameters = false;
8484
for (_, prm_ref) in gsd.user_prm_data.data_ref.iter() {
@@ -103,8 +103,9 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
103103
.interact()
104104
.unwrap();
105105

106-
let sel_text = &texts_list[selection];
107-
prm.set_prm_from_text(&prm_ref.name, sel_text);
106+
let sel_text = &texts_list.get(selection).expect("TODO");
107+
prm.set_prm_from_text(&prm_ref.name, sel_text)
108+
.expect("TODO");
108109

109110
global_parameters.push((prm_ref.name.to_owned(), sel_text.to_string()));
110111
} else if let gsd_parser::PrmValueConstraint::MinMax(min, max) = prm_ref.constraint {
@@ -121,8 +122,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
121122
.interact()
122123
.unwrap();
123124

124-
let value: i64 = str::parse(&value).unwrap();
125-
prm.set_prm(&prm_ref.name, value);
125+
let value: i64 = str::parse(&value).expect("TODO");
126+
prm.set_prm(&prm_ref.name, value).expect("TODO");
126127

127128
global_parameters.push((prm_ref.name.to_owned(), value.to_string()));
128129
} else if let gsd_parser::PrmValueConstraint::Enum(values) = &prm_ref.constraint {
@@ -141,8 +142,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
141142
.interact()
142143
.unwrap();
143144

144-
let value: i64 = values[selection];
145-
prm.set_prm(&prm_ref.name, value);
145+
let value: i64 = values.get(selection).copied().expect("TODO");
146+
prm.set_prm(&prm_ref.name, value).expect("TODO");
146147

147148
global_parameters.push((prm_ref.name.to_owned(), value.to_string()));
148149
} else {
@@ -159,8 +160,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
159160
.interact()
160161
.unwrap();
161162

162-
let value: i64 = str::parse(&value_str).unwrap();
163-
prm.set_prm(&prm_ref.name, value);
163+
let value: i64 = str::parse(&value_str).expect("TODO");
164+
prm.set_prm(&prm_ref.name, value).expect("TODO");
164165

165166
global_parameters.push((prm_ref.name.to_owned(), value_str));
166167
}
@@ -254,7 +255,7 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
254255

255256
module_config.append(&mut module.config.to_vec());
256257

257-
let mut prm = gsd_parser::PrmBuilder::new(&module.module_prm_data);
258+
let mut prm = gsd_parser::PrmBuilder::new(&module.module_prm_data).expect("TODO");
258259
let mut module_parameters = vec![];
259260
for (_, prm_ref) in module.module_prm_data.data_ref.iter() {
260261
if !prm_ref.visible || !prm_ref.changeable {
@@ -279,7 +280,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
279280
.unwrap();
280281

281282
let sel_text = &texts_list[selection];
282-
prm.set_prm_from_text(&prm_ref.name, sel_text);
283+
prm.set_prm_from_text(&prm_ref.name, sel_text)
284+
.expect("TODO");
283285

284286
module_parameters.push((prm_ref.name.to_owned(), sel_text.to_string()));
285287
} else if let gsd_parser::PrmValueConstraint::MinMax(min, max) = prm_ref.constraint
@@ -297,8 +299,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
297299
.interact()
298300
.unwrap();
299301

300-
let value: i64 = str::parse(&value).unwrap();
301-
prm.set_prm(&prm_ref.name, value);
302+
let value: i64 = str::parse(&value).expect("TODO");
303+
prm.set_prm(&prm_ref.name, value).expect("TODO");
302304

303305
module_parameters.push((prm_ref.name.to_owned(), value.to_string()));
304306
} else if let gsd_parser::PrmValueConstraint::Enum(values) = &prm_ref.constraint {
@@ -317,8 +319,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
317319
.interact()
318320
.unwrap();
319321

320-
let value: i64 = values[selection];
321-
prm.set_prm(&prm_ref.name, value);
322+
let value: i64 = values.get(selection).copied().expect("TODO");
323+
prm.set_prm(&prm_ref.name, value).expect("TODO");
322324

323325
module_parameters.push((prm_ref.name.to_owned(), value.to_string()));
324326
} else {
@@ -335,8 +337,8 @@ fn run_config_wizard(args: &ConfigWizardOptions) {
335337
.interact()
336338
.unwrap();
337339

338-
let value: i64 = str::parse(&value_str).unwrap();
339-
prm.set_prm(&prm_ref.name, value);
340+
let value: i64 = str::parse(&value_str).expect("TODO");
341+
prm.set_prm(&prm_ref.name, value).expect("TODO");
340342

341343
module_parameters.push((prm_ref.name.to_owned(), value_str));
342344
}

0 commit comments

Comments
 (0)