mirror/kanshi
1
0
Fork 0
mirror of https://github.com/emersion/kanshi synced 2024-11-23 00:02:16 +01:00
Code Issues Releases Activity

Make notifier optional

Browse Source
This commit is contained in:
emersion 2018-09-16 14:23:38 +02:00
parent 0d50a40f16
commit 810a33b9b2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@ -112,8 +112,9 @@ fn main() {
_ => panic!("Unknown store"),
};
let notifier: Box<Notifier> = match opts_matches.opt_str("notifier").as_ref().map(String::as_ref) {
None | Some("udev") => Box::new(UdevNotifier{}),
let notifier: Option<Box<Notifier>> = match opts_matches.opt_str("notifier").as_ref().map(String::as_ref) {
None | Some("udev") => Some(Box::new(UdevNotifier{})),
Some("none") => None,
_ => panic!("Unknown notifier"),
};
@ -122,8 +123,11 @@ fn main() {
_ => panic!("Unknown frontend"),
};
let (tx, rx) = channel();
notifier.notify(tx).unwrap();
let rx = notifier.map(|notifier| {
let (tx, rx) = channel();
notifier.notify(tx).unwrap();
rx
});
loop {
let connected_outputs = match backend.list_outputs() {
@ -183,7 +187,12 @@ fn main() {
},
};
writeln!(&mut stderr, "Waiting for output changes...").unwrap();
rx.recv().unwrap();
match rx {
Some(ref rx) => {
writeln!(&mut stderr, "Waiting for output changes...").unwrap();
rx.recv().unwrap();
}
None => break
}
}
}