starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-24 01:28:39 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

feat(bar): handle komorebi restarts gracefully

Browse Source
This commit is contained in:
LGUG2Z
2024-08-10 14:23:52 -07:00
parent b3990590f3
commit bc2f4a172e
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
komorebi-bar/src/main.rs
View File

@@ -18,8 +18,8 @@ use eframe::egui::Visuals;
use eframe::emath::Pos2; use eframe::emath::Pos2;
use eframe::emath::Vec2; use eframe::emath::Vec2;
use komorebi_client::SocketMessage; use komorebi_client::SocketMessage;
use std::io::BufRead;
use std::io::BufReader; use std::io::BufReader;
use std::io::Read;
use std::process::Command; use std::process::Command;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@@ -101,6 +101,7 @@ fn main() -> eframe::Result<()> {
native_options, native_options,
Box::new(|cc| { Box::new(|cc| {
let frame = cc.egui_ctx.clone(); let frame = cc.egui_ctx.clone();
let config_cl = config_arc.clone();
std::thread::spawn(move || { std::thread::spawn(move || {
let listener = komorebi_client::subscribe("komorebi-bar").unwrap(); let listener = komorebi_client::subscribe("komorebi-bar").unwrap();
@@ -108,19 +109,12 @@ fn main() -> eframe::Result<()> {
for client in listener.incoming() { for client in listener.incoming() {
match client { match client {
Ok(subscription) => { Ok(subscription) => {
let reader = BufReader::new(subscription); let mut buffer = Vec::new();
let mut reader = BufReader::new(subscription);
for line in reader.lines().flatten() { // this is when we know a shutdown has been sent
if let Ok(notification) = if matches!(reader.read_to_end(&mut buffer), Ok(0)) {
serde_json::from_str::<komorebi_client::Notification>(&line) // keep trying to reconnect to komorebi
{
tx_gui.send(notification).unwrap();
frame.request_repaint();
}
}
}
Err(error) => {
if error.raw_os_error().expect("could not get raw os error") == 109 {
while komorebi_client::send_message( while komorebi_client::send_message(
&SocketMessage::AddSubscriberSocket(String::from( &SocketMessage::AddSubscriberSocket(String::from(
"komorebi-bar", "komorebi-bar",
@@ -128,9 +122,35 @@ fn main() -> eframe::Result<()> {
) )
.is_err() .is_err()
{ {
std::thread::sleep(Duration::from_secs(5)); std::thread::sleep(Duration::from_secs(1));
}
// here we have reconnected
if let Some(rect) = &config_cl.monitor_work_area_offset {
while komorebi_client::send_message(
&SocketMessage::MonitorWorkAreaOffset(
config_cl.monitor_index,
*rect,
),
)
.is_err()
{
std::thread::sleep(Duration::from_secs(1));
}
} }
} }
if let Ok(notification) =
serde_json::from_str::<komorebi_client::Notification>(
&String::from_utf8(buffer).unwrap(),
)
{
tx_gui.send(notification).unwrap();
frame.request_repaint();
}
}
Err(error) => {
dbg!(error);
} }
} }
} }