mirror/swaysome
1
0
Fork 0
mirror of https://gitlab.com/hyask/swaysome.git synced 2025-12-10 07:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always sort lists of objects returned by sway

Browse source 
Fixes #2
This commit is contained in:
Skia 2021-11-07 00:54:17 +01:00
parent aa2a232320
commit 57272671ed
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main.rs
View file

@ -118,7 +118,9 @@ fn get_outputs(stream: &UnixStream) -> Vec<Output> {
Ok(msg) => msg, Ok(msg) => msg,
Err(_) => panic!("Unable to get outputs"), Err(_) => panic!("Unable to get outputs"),
}; };
serde_json::from_str(&o).unwrap() let mut outputs: Vec<Output> = serde_json::from_str(&o).unwrap();
outputs.sort_by(|x, y| x.name.cmp(&y.name)); // sort_by_key doesn't work here (https://stackoverflow.com/a/47126516)
outputs
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@ -134,7 +136,9 @@ fn get_workspaces(stream: &UnixStream) -> Vec<Workspace> {
Ok(msg) => msg, Ok(msg) => msg,
Err(_) => panic!("Unable to get current workspace"), Err(_) => panic!("Unable to get current workspace"),
}; };
serde_json::from_str(&ws).unwrap() let mut workspaces: Vec<Workspace> = serde_json::from_str(&ws).unwrap();
workspaces.sort_by_key(|x| x.num);
workspaces
} }
fn get_current_output_index(stream: &UnixStream) -> String { fn get_current_output_index(stream: &UnixStream) -> String {