3 Commits

Author SHA1 Message Date
bel
6bbb9861ef log when feedback.read fails 2023-03-25 14:40:22 -06:00
bel
645285019e gui flushes all messages received from server at once, both dedupes and doesnt fill q 2023-03-25 11:27:02 -06:00
bel
49133b5f7a manual test w mayhem-party v0.1.2 ok 2023-03-25 11:02:03 -06:00

View File

@@ -109,10 +109,14 @@ impl Main {
} }
fn exchange_recv(&mut self) { fn exchange_recv(&mut self) {
match self.c.try_recv() { loop {
Ok(msg) => self.ntfy2 = msg, match self.c.try_recv() {
_ => {}, Ok(msg) => {
}; self.ntfy2 = msg
},
_ => return,
};
}
} }
fn exchange_send(&mut self) { fn exchange_send(&mut self) {
@@ -343,7 +347,9 @@ impl Feedback {
loop { loop {
std::thread::sleep(std::time::Duration::from_secs(2)); std::thread::sleep(std::time::Duration::from_secs(2));
match self.read() { match self.read() {
Some(msg) if msg.len() > 0 => self.write(msg), Some(msg) if msg.len() > 0 => {
self.write(msg.clone());
},
_ => {}, _ => {},
}; };
} }
@@ -351,12 +357,17 @@ impl Feedback {
fn read(&mut self) -> Option<String> { fn read(&mut self) -> Option<String> {
return match &self.cfg.url { return match &self.cfg.url {
Some(url) => match reqwest::blocking::get(url) { Some(url) => {
Ok(resp) => match resp.text() { match reqwest::blocking::get(url) {
Ok(text) => Some(text), Ok(resp) => match resp.text() {
_ => None, Ok(text) => Some(text),
}, _ => None,
_ => None, },
Err(err) => {
eprintln!("feedback.read: cannot fetch: {}", err);
None
},
}
}, },
_ => None, _ => None,
}; };