secstate/Notify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various small cleanups

Browse Source
This commit is contained in:
ranfdev
2023-10-27 11:30:24 +02:00
parent 04c3f86a4b
commit d93356905c
6 changed files with 54 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/widgets/message_row.rs
View File

@ -145,39 +145,29 @@ impl MessageRow {
self.attach(&tags, 0, row, 3, 1);
}
}
fn fetch_image_bytes(url: &str) -> anyhow::Result<Vec<u8>> {
let path = glib::user_cache_dir().join("com.ranfdev.Notify").join(&url);
let bytes = if path.exists() {
std::fs::read(&path)?
} else {
let mut bytes = vec![];
ureq::get(&url)
.call()?
.into_reader()
.take(5 * 1_000_000) // 5 MB
.read_to_end(&mut bytes)?;
bytes
};
Ok(bytes)
}
fn build_image(&self, url: String) -> gtk::Picture {
let (tx, rx) = glib::MainContext::channel(Default::default());
gio::spawn_blocking(move || {
let path = glib::user_cache_dir().join("com.ranfdev.Notify").join(&url);
let bytes = if path.exists() {
match std::fs::read(&path) {
Ok(v) => v,
Err(e) => {
error!(error = %e, path = %path.display(), "reading image from disk");
return glib::ControlFlow::Break;
}
}
} else {
let res = match ureq::get(&url).call() {
Ok(res) => res,
Err(e) => {
error!(error = %e, "fetching image");
return glib::ControlFlow::Break;
}
};
let mut bytes = vec![];
if let Err(e) = res
.into_reader()
.take(5 * 1_000_000) // 5 MB
.read_to_end(&mut bytes)
{
error!(error = %e, "reading image data");
return glib::ControlFlow::Break;
}
bytes
};
tx.send(glib::Bytes::from_owned(bytes)).unwrap();
if let Err(e) =
Self::fetch_image_bytes(&url).map(|bytes| tx.send(glib::Bytes::from_owned(bytes)))
{
error!(error = %e)
}
glib::ControlFlow::Break
});
let picture = gtk::Picture::new();

4
src/widgets/window.rs
View File

@ -346,7 +346,7 @@ impl NotifyWindow {
.bind_model(Some(&imp.subscription_list_model), |obj| {
let sub = obj.downcast_ref::<Subscription>().unwrap();
Self::build_subscription_ui(&sub).upcast()
Self::build_subscription_row(&sub).upcast()
});
let this = self.clone();
@ -445,7 +445,7 @@ impl NotifyWindow {
chip
}
fn build_subscription_ui(sub: &Subscription) -> impl glib::IsA<gtk::Widget> {
fn build_subscription_row(sub: &Subscription) -> impl glib::IsA<gtk::Widget> {
let b = gtk::Box::builder().spacing(4).build();
let label = gtk::Label::builder()