toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'alatiera/cover_load_perf' into 'master'

Browse Source 
Cover loading performance improvments

See merge request World/podcasts!67
This commit is contained in:
Jordan Petridis 2018-08-29 07:29:17 +00:00
commit 174c814541
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
podcasts-gtk/src/utils.rs
View File

@ -251,21 +251,6 @@ pub(crate) fn set_image_from_path(
show_id: i32, show_id: i32,
size: u32, size: u32,
) -> Result<(), Error> { ) -> Result<(), Error> {
// Check if there's an active download about this show cover.
// If there is, a callback will be set so this function will be called again.
// If the download succeeds, there should be a quick return from the pixbuf cache_image
// If it fails another download will be scheduled.
if let Ok(guard) = COVER_DL_REGISTRY.read() {
if guard.contains(&show_id) {
let callback = clone!(image => move || {
let _ = set_image_from_path(&image, show_id, size);
glib::Continue(false)
});
gtk::timeout_add(250, callback);
return Ok(());
}
}
if let Ok(hashmap) = CACHED_PIXBUFS.read() { if let Ok(hashmap) = CACHED_PIXBUFS.read() {
// Check if the requested (cover + size) is already in the cache // Check if the requested (cover + size) is already in the cache
// and if so do an early return after that. // and if so do an early return after that.
@ -284,16 +269,38 @@ pub(crate) fn set_image_from_path(
} }
} }
// Check if there's an active download about this show cover.
// If there is, a callback will be set so this function will be called again.
// If the download succeeds, there should be a quick return from the pixbuf cache_image
// If it fails another download will be scheduled.
if let Ok(guard) = COVER_DL_REGISTRY.read() {
if guard.contains(&show_id) {
let callback = clone!(image => move || {
let _ = set_image_from_path(&image, show_id, size);
glib::Continue(false)
});
gtk::timeout_add(250, callback);
return Ok(());
}
}
let (sender, receiver) = unbounded(); let (sender, receiver) = unbounded();
THREADPOOL.spawn(move || { if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
if let Ok(mut guard) = COVER_DL_REGISTRY.write() { // Add the id to the hashmap from the main thread to avoid queuing more than one downloads.
guard.insert(show_id); guard.insert(show_id);
drop(guard);
THREADPOOL.spawn(move || {
// This operation is polling and will block the thread till the download is finished
if let Ok(pd) = dbqueries::get_podcast_cover_from_id(show_id) { if let Ok(pd) = dbqueries::get_podcast_cover_from_id(show_id) {
sender.send(downloader::cache_image(&pd)); sender.send(downloader::cache_image(&pd));
} }
guard.remove(&show_id);
} if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
}); guard.remove(&show_id);
}
});
}
let image = image.clone(); let image = image.clone();
let s = size as i32; let s = size as i32;