rayandrew/swaysome
rayandrew/swaysome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move 'get_workspaces' to its own function

Browse source
This commit is contained in:
Skia 2021-01-15 01:11:32 +01:00
parent 84820a07d0
commit 8a6a727b69
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -155,6 +155,15 @@ fn get_outputs(stream: &UnixStream) -> Vec<Output> {
serde_json::from_str(&o).unwrap() serde_json::from_str(&o).unwrap()
} }
fn get_workspaces(stream: &UnixStream) -> Vec<Workspace> {
send_msg(&stream, GET_WORKSPACES, "");
let ws = match read_msg(&stream) {
Ok(msg) => msg,
Err(_) => panic!("Unable to get current workspace"),
};
serde_json::from_str(&ws).unwrap()
}
fn get_current_output_name(stream: &UnixStream) -> String { fn get_current_output_name(stream: &UnixStream) -> String {
let outputs = get_outputs(&stream); let outputs = get_outputs(&stream);
@ -167,12 +176,7 @@ fn get_current_output_name(stream: &UnixStream) -> String {
} }
fn get_current_workspace_name(stream: &UnixStream) -> String { fn get_current_workspace_name(stream: &UnixStream) -> String {
send_msg(&stream, GET_WORKSPACES, ""); let workspaces = get_workspaces(&stream);
let ws = match read_msg(&stream) {
Ok(msg) => msg,
Err(_) => panic!("Unable to get current workspace"),
};
let workspaces: Vec<Workspace> = serde_json::from_str(&ws).unwrap();
let focused_workspace_index = match workspaces.iter().position(|x| x.focused) { let focused_workspace_index = match workspaces.iter().position(|x| x.focused) {
Some(i) => i, Some(i) => i,