Skip to content

Commit bf02f14

Browse files
author
Deren Vural
committed
Finally finished the Nvidia Settings app call!
Can now only open one of these at a time. Needs to cancel if the program exits before the Nvidia Settings app closes.. Updated MainWindow class: - Removed unused dependancies - Updated setup_actions() function to properly update settings when nvidia-settings is opened (i.e. only on success) - Added output to user on already open nvidia-settings app Updated Processor class: - Updated to use exec_communicate_sync - Clarified print statements with backtics Updated Provider class: - Cleaned up dependancies - Updated exec_check to exec_communicate_async - Updated "open_settings()" function to use exec_communicate_async - Squashed "open_settings()" function match statement to remove duplicate responses - Now updates settings on nvidia-settings program end Updated subprocess module: - Renamed the modules to async/sync - Added new exec_communicate_async that runs a closure on finish Signed-off-by: Deren Vural <[email protected]>
1 parent a74db25 commit bf02f14

File tree

5 files changed

+158
-88
lines changed

5 files changed

+158
-88
lines changed

‎src/mainwindow/imp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
use adwaita::{gio, glib, prelude::*, subclass::prelude::*};
2222
use gio::Settings;
2323
use glib::{
24-
clone, once_cell::sync::Lazy, once_cell::sync::OnceCell, signal::Inhibit,
24+
once_cell::sync::Lazy, once_cell::sync::OnceCell, signal::Inhibit,
2525
subclass::InitializingObject, FromVariant, ParamSpec, Value,
2626
};
2727
use gtk::{
2828
subclass::prelude::*, Button, CompositeTemplate, PolicyType, ScrolledWindow, Stack,
2929
TemplateChild,
3030
};
3131
use std::{
32-
cell::Cell, cell::RefCell, cell::RefMut, rc::Rc, sync::Arc, sync::Mutex, sync::MutexGuard,
32+
cell::Cell, cell::RefCell, cell::RefMut, rc::Rc
3333
};
3434

3535
// Modules

‎src/mainwindow/mod.rs

Lines changed: 54 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -274,57 +274,63 @@ impl MainWindow {
274274
//let def = shell::Edge::Top;
275275
//let dd = gio::DesktopAppInfo::from_filename("nvidia-settings.desktop");
276276

277-
if !app_settings_open {
278-
// Grab current stored provider
279-
let mut provider: Option<Provider> = window.property("provider");
280-
281-
// Check if provider exists
282-
match provider {
283-
Some(prov) => {
284-
// Open Nvidia Settings
285-
match prov.open_settings() {
286-
Ok(_result) => {
287-
println!("Opening the Nvidia Settings app..");
288-
},
289-
Err(err) => println!(
290-
"An error occured: {}",
291-
err
292-
),
293-
}
294-
},
295-
None => {
296-
// Check provider type
297-
let provider_type: i32 = window.imp().get_setting::<i32>("provider");
298-
299-
// Create new provider
300-
//println!("Creating new Provider..");//TEST
301-
window.set_property("provider", Some(window.imp().create_provider(provider_type)));
302-
303-
// Grab new provider
304-
provider = window.property("provider");
305-
306-
// Open Nvidia Settings
307-
println!("Opening the Nvidia Settings app..");//TEST
308-
match provider {
309-
Some(prov) => {
310-
// Open Nvidia Settings
311-
match prov.open_settings() {
312-
Ok(_result) => {
313-
println!("Opening the Nvidia Settings app..");
314-
},
315-
Err(err) => println!(
316-
"An error occured: {}",
317-
err
318-
),
319-
}
320-
},
321-
None => panic!("Cannot find `Provider`!")
277+
match app_settings_open {
278+
false => {
279+
// Grab current stored provider
280+
let mut provider: Option<Provider> = window.property("provider");
281+
282+
// Check if provider exists
283+
match provider {
284+
Some(prov) => {
285+
// Open Nvidia Settings
286+
match prov.open_settings() {
287+
Ok(_) => {
288+
println!("Opening the Nvidia Settings app..");
289+
290+
// Set state in settings
291+
window.imp().update_setting::<bool>("nvidia-settings-open", true);
292+
},
293+
Err(err) => println!(
294+
"An error occured: {}",
295+
err
296+
),
297+
}
298+
},
299+
None => {
300+
// Check provider type
301+
let provider_type: i32 = window.imp().get_setting::<i32>("provider");
302+
303+
// Create new provider
304+
//println!("Creating new Provider..");//TEST
305+
window.set_property("provider", Some(window.imp().create_provider(provider_type)));
306+
307+
// Grab new provider
308+
provider = window.property("provider");
309+
310+
// Open Nvidia Settings
311+
println!("Opening the Nvidia Settings app..");//TEST
312+
match provider {
313+
Some(prov) => {
314+
// Open Nvidia Settings
315+
match prov.open_settings() {
316+
Ok(_) => {
317+
println!("Opening the Nvidia Settings app..");
318+
319+
// Set state in settings
320+
window.imp().update_setting::<bool>("nvidia-settings-open", true);
321+
},
322+
Err(err) => println!(
323+
"An error occured: {}",
324+
err
325+
),
326+
}
327+
},
328+
None => panic!("Cannot find `Provider`!")
329+
}
322330
}
323331
}
324332
}
325-
326-
// Set state in settings
327-
window.imp().update_setting::<bool>("nvidia-settings-open", true);
333+
true => println!("Nvidia Settings app already open!"),
328334
}
329335
}));
330336
self.add_action(&open_nvidia_settings);

‎src/processor/mod.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use gtk::{gio, glib, prelude::ObjectExt};
2727
use std::ffi::OsStr;
2828

2929
// Crates
30-
use crate::subprocess::subprocess::exec_communicate;
30+
use crate::subprocess::subprocess::exec_communicate_sync;
3131

3232
// GObject wrapper for Processor
3333
glib::wrapper! {
@@ -194,14 +194,14 @@ impl Processor {
194194
];
195195

196196
// Run process, get output
197-
match exec_communicate(&argv, None::<&gio::Cancellable>) {
197+
match exec_communicate_sync(&argv, None::<&gio::Cancellable>) {
198198
Ok(return_val) => match return_val {
199199
// ACTUAL
200200
(None, None) => return Ok(None),
201201

202202
(None, Some(stderr_buffer)) => {
203203
println!(
204-
"Process failed with error: {}",
204+
"Process failed with error: `{}`",
205205
String::from_utf8_lossy(&stderr_buffer)
206206
);
207207
}
@@ -212,7 +212,7 @@ impl Processor {
212212

213213
(Some(stdout_buffer), Some(stderr_buffer)) => {
214214
println!(
215-
"Process succeeded, but with error: {}",
215+
"Process succeeded, but with error: `{}`",
216216
String::from_utf8_lossy(&stderr_buffer)
217217
);
218218

@@ -234,14 +234,14 @@ impl Processor {
234234
];
235235

236236
// Run process, get output
237-
match exec_communicate(&argv, None::<&gio::Cancellable>) {
237+
match exec_communicate_sync(&argv, None::<&gio::Cancellable>) {
238238
Ok(return_val) => match return_val {
239239
// ACTUAL
240240
(None, None) => return Ok(None),
241241

242242
(None, Some(stderr_buffer)) => {
243243
println!(
244-
"Process failed with error: {}",
244+
"Process failed with error: `{}`",
245245
String::from_utf8_lossy(&stderr_buffer)
246246
);
247247
}
@@ -252,7 +252,7 @@ impl Processor {
252252

253253
(Some(stdout_buffer), Some(stderr_buffer)) => {
254254
println!(
255-
"Process failed with error: {}",
255+
"Process failed with error: `{}`",
256256
String::from_utf8_lossy(&stderr_buffer)
257257
);
258258

@@ -273,14 +273,14 @@ impl Processor {
273273
];
274274

275275
// Run process, get output
276-
match exec_communicate(&argv, None::<&gio::Cancellable>) {
276+
match exec_communicate_sync(&argv, None::<&gio::Cancellable>) {
277277
Ok(return_val) => match return_val {
278278
// ACTUAL
279279
(None, None) => return Ok(None),
280280

281281
(None, Some(stderr_buffer)) => {
282282
println!(
283-
"Process failed with error: {}",
283+
"Process failed with error: `{}`",
284284
String::from_utf8_lossy(&stderr_buffer)
285285
);
286286
}
@@ -291,7 +291,7 @@ impl Processor {
291291

292292
(Some(stdout_buffer), Some(stderr_buffer)) => {
293293
println!(
294-
"Process failed with error: {}",
294+
"Process failed with error: `{}`",
295295
String::from_utf8_lossy(&stderr_buffer)
296296
);
297297

@@ -311,14 +311,14 @@ impl Processor {
311311
];
312312

313313
// Run process, get output
314-
match exec_communicate(&argv, None::<&gio::Cancellable>) {
314+
match exec_communicate_sync(&argv, None::<&gio::Cancellable>) {
315315
Ok(return_val) => match return_val {
316316
// ACTUAL
317317
(None, None) => return Ok(None),
318318

319319
(None, Some(stderr_buffer)) => {
320320
println!(
321-
"Process failed with error: {}",
321+
"Process failed with error: `{}`",
322322
String::from_utf8_lossy(&stderr_buffer)
323323
);
324324
}
@@ -329,7 +329,7 @@ impl Processor {
329329

330330
(Some(stdout_buffer), Some(stderr_buffer)) => {
331331
println!(
332-
"Process failed with error: {}",
332+
"Process failed with error: `{}`",
333333
String::from_utf8_lossy(&stderr_buffer)
334334
);
335335

@@ -345,14 +345,14 @@ impl Processor {
345345
let argv: [&OsStr; 2] = [call_stack_items[0], call_stack_items[1]];
346346

347347
// Run process, get output
348-
match exec_communicate(&argv, None::<&gio::Cancellable>) {
348+
match exec_communicate_sync(&argv, None::<&gio::Cancellable>) {
349349
Ok(return_val) => match return_val {
350350
// ACTUAL
351351
(None, None) => return Ok(None),
352352

353353
(None, Some(stderr_buffer)) => {
354354
println!(
355-
"Process failed with error: {}",
355+
"Process failed with error: `{}`",
356356
String::from_utf8_lossy(&stderr_buffer)
357357
);
358358
}
@@ -363,7 +363,7 @@ impl Processor {
363363

364364
(Some(stdout_buffer), Some(stderr_buffer)) => {
365365
println!(
366-
"Process failed with error: {}",
366+
"Process failed with error: `{}`",
367367
String::from_utf8_lossy(&stderr_buffer)
368368
);
369369

‎src/provider/mod.rs

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ mod imp;
2222

2323
// Imports
2424
use adwaita::{gio, glib};
25+
use gio::Settings;
2526
use glib::Object;
26-
use gtk::prelude::*;
27-
use gtk::subclass::prelude::*;
27+
use gtk::{prelude::*, subclass::prelude::*};
2828
use std::ffi::OsStr;
2929

3030
// Crates
31-
use crate::{processor::Processor, property::Property, subprocess::subprocess::exec_check};
31+
use crate::{processor::Processor, property::Property, subprocess::subprocess::exec_communicate_async, APP_ID};
3232

3333
// GObject wrapper for Provider
3434
glib::wrapper! {
@@ -306,24 +306,48 @@ impl Provider {
306306
// Check provider type
307307
match self.property::<i32>("provider-type") {
308308
// Open Nvidia Settings
309-
0 => {
310-
match exec_check(&[OsStr::new("nvidia-settings")], None::<&gio::Cancellable>) {
311-
Ok(result) => return Ok(result),
312-
Err(err) => return Err(String::from(err.message())),
313-
};
314-
}
315-
1 => {
316-
match exec_check(&[OsStr::new("nvidia-settings")], None::<&gio::Cancellable>) {
317-
Ok(result) => return Ok(result),
318-
Err(err) => return Err(String::from(err.message())),
309+
0 | 1 => {
310+
match exec_communicate_async(&[OsStr::new("nvidia-settings")], None::<&gio::Cancellable>, |result| {
311+
// Callback
312+
match result {
313+
Err(err) => {
314+
println!(
315+
"Process failed with error: `{}`",
316+
err.to_string()
317+
);
318+
}
319+
Ok(buffers) => match buffers {
320+
// Success
321+
(Some(_), None) | (None, None) => {
322+
println!("Nvidia Settings now closed..");
323+
324+
// Get settings for APP_ID
325+
let settings = Settings::new(APP_ID);
326+
327+
// Update settings
328+
let name: &str = "nvidia-settings-open";
329+
match settings.set_boolean(name, false){
330+
Ok(_) => println!("..Setting `{}` updated!", name),
331+
Err(err) => panic!("..Cannot update `{}` setting: `{}`", name, err),
332+
}
333+
}
334+
// Error
335+
(None, Some(stderr_buffer)) | (Some(_), Some(stderr_buffer)) => {
336+
println!(
337+
"Process failed with error: `{}`",
338+
String::from_utf8_lossy(&stderr_buffer)
339+
);
340+
}
341+
},
342+
}
343+
}) {
344+
Ok(()) => return Ok(()),
345+
Err(err) => return Err(err.to_string()),
319346
};
320347
}
321348
// Error Message
322-
2 => Err(String::from(
323-
"Nvidia Settings is not enabled in preferences..",
324-
)),
325-
3 => Err(String::from(
326-
"Nvidia Settings is not enabled in preferences..",
349+
2 | 3 => Err(String::from(
350+
"Nvidia Settings cabable provider is not enabled in preferences..",
327351
)),
328352
_ => Err(String::from("Invalid provider, check preferences..")),
329353
}

0 commit comments

Comments
 (0)