zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-03 03:31:03 +02:00
Code Activity

refactor: standardise error messages

Browse source
This commit is contained in:
Jake Stanger 2022-12-11 21:31:45 +00:00
parent fd2d7e5c7a
commit 9d5049dde0
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
19 changed files with 117 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/dynamic_string.rs
View file

@ -1,3 +1,4 @@
use crate::error;
use crate::script::{OutputStream, Script};
use gtk::prelude::*;
use indexmap::IndexMap;
@ -10,9 +11,7 @@ enum DynamicStringSegment {
Dynamic(Script),
}
pub struct DynamicString {
// pub label: gtk::Label,
}
pub struct DynamicString;
impl DynamicString {
pub fn new<F>(input: &str, f: F) -> Self
@ -69,7 +68,7 @@ impl DynamicString {
DynamicStringSegment::Static(str) => {
label_parts
.lock()
.expect("Failed to get lock on label parts")
.expect(error::ERR_MUTEX_LOCK)
.insert(i, str);
}
DynamicStringSegment::Dynamic(script) => {
@ -80,9 +79,8 @@ impl DynamicString {
script
.run(|(out, _)| {
if let OutputStream::Stdout(out) = out {
let mut label_parts = label_parts
.lock()
.expect("Failed to get lock on label parts");
let mut label_parts =
label_parts.lock().expect(error::ERR_MUTEX_LOCK);
label_parts
// .lock()
@ -94,7 +92,7 @@ impl DynamicString {
.map(|(_, part)| part.as_str())
.collect::<String>();
tx.send(string).expect("Failed to send update");
tx.send(string).expect(error::ERR_CHANNEL_SEND);
}
})
.await;
@ -107,18 +105,17 @@ impl DynamicString {
{
let label_parts = label_parts
.lock()
.expect("Failed to get lock on label parts")
.expect(error::ERR_MUTEX_LOCK)
.iter()
.map(|(_, part)| part.as_str())
.collect::<String>();
tx.send(label_parts).expect("Failed to send update");
tx.send(label_parts).expect(error::ERR_CHANNEL_SEND);
}
rx.attach(None, f);
// Self { label }
Self {}
Self
}
}