Hexor/swkb
1
0
Fork 0
mirror of https://github.com/house-of-vanity/swkb.git synced 2025-07-07 03:14:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Got rid of some unwraps.

Browse Source
This commit is contained in:
Alexandr Bogomyakov
2020-08-03 23:29:45 +03:00
parent 989893ae41
commit 3e2cea8dc0
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -536,7 +536,7 @@ dependencies = [
[[package]] [[package]]
name = "swkb" name = "swkb"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"async-std", "async-std",
"failure", "failure",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "swkb" name = "swkb"
version = "0.2.1" version = "0.2.2"
authors = ["Alexandr Bogomyakov <abogomyakov@iponweb.net>"] authors = ["Alexandr Bogomyakov <abogomyakov@iponweb.net>"]
edition = "2018" edition = "2018"

17
src/main.rs
View File

@ -7,10 +7,14 @@ use swayipc::{Connection, EventType, Fallible};
async fn get_input_id() -> Vec<String> { async fn get_input_id() -> Vec<String> {
let mut connection = Connection::new().await.unwrap(); let mut connection = Connection::new().await.unwrap();
let inputs = connection.get_inputs().await.unwrap();
let mut ids: Vec<String> = Vec::new(); let mut ids: Vec<String> = Vec::new();
for i in inputs { match connection.get_inputs().await {
ids.push(i.identifier); Ok(inputs) => {
for i in inputs {
ids.push(i.identifier);
}
}
_ => {}
} }
ids ids
} }
@ -49,8 +53,11 @@ async fn main() -> Fallible<()> {
match event { match event {
Ok(Event::Input(event)) => { Ok(Event::Input(event)) => {
let layouts_list = event.input.xkb_layout_names; let layouts_list = event.input.xkb_layout_names;
let layout_name = event.input.xkb_active_layout_name.unwrap(); let layout_name = event.input.xkb_active_layout_name.unwrap_or("none".to_string());
let index = layouts_list.iter().position(|r| *r == layout_name).unwrap() as i64; if layout_name == "none" {
continue
}
let index = layouts_list.iter().position(|r| *r == layout_name).unwrap_or(0) as i64;
let mut layouts = layouts.lock().unwrap(); let mut layouts = layouts.lock().unwrap();
let current_window = get_focus_id().await; let current_window = get_focus_id().await;
//println!("Layout saved [{:?}] for {:?}", layout_name, current_window); //println!("Layout saved [{:?}] for {:?}", layout_name, current_window);