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

hammond-gtk/utils.rs: Use a hashset to keep track of cover downloads.

Browse Source 
Use a HashSet to check if a download of a cover is already active. If
it is, schedule a callback that will try to set the image from the
cached pixbuf later.
This commit is contained in:
Jordan Petridis 2018-03-29 13:07:46 +03:00
parent c3658080d3
commit e203815f4f
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hammond-gtk/src/utils.rs
View File

@ -133,7 +133,11 @@ fn refresh_feed(source: Option<Vec<Source>>, sender: Sender<Action>) -> Result<(
lazy_static! { lazy_static! {
static ref CACHED_PIXBUFS: RwLock<HashMap<(i32, u32), Mutex<SendCell<Pixbuf>>>> = static ref CACHED_PIXBUFS: RwLock<HashMap<(i32, u32), Mutex<SendCell<Pixbuf>>>> =
{ RwLock::new(HashMap::new()) }; { RwLock::new(HashMap::new()) };
static ref THREADPOOL: rayon::ThreadPool = rayon::ThreadPoolBuilder::new().build().unwrap(); static ref COVER_DL_REGISTRY: RwLock<HashSet<i32>> = RwLock::new(HashSet::new());
static ref THREADPOOL: rayon::ThreadPool = rayon::ThreadPoolBuilder::new()
.breadth_first()
.build()
.unwrap();
} }
// Since gdk_pixbuf::Pixbuf is refference counted and every episode, // Since gdk_pixbuf::Pixbuf is refference counted and every episode,
@ -148,6 +152,26 @@ pub fn set_image_from_path(
pd: Arc<PodcastCoverQuery>, pd: Arc<PodcastCoverQuery>,
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 succedes, there should be a quick return from the pixbuf cache_image
// If it fails another download will be scheduled.
let reg_guard = COVER_DL_REGISTRY
.read()
.map_err(|err| format_err!("Cover Registry: {}.", err))?;
if reg_guard.contains(&pd.id()) {
gtk::timeout_add(
250,
clone!(image, pd => move || {
let _ = set_image_from_path(&image, pd.clone(), size);
glib::Continue(false)
}),
);
return Ok(());
}
}
{ {
let hashmap = CACHED_PIXBUFS let hashmap = CACHED_PIXBUFS
.read() .read()
@ -164,12 +188,22 @@ pub fn set_image_from_path(
let (sender, receiver) = channel(); let (sender, receiver) = channel();
let pd_ = pd.clone(); let pd_ = pd.clone();
THREADPOOL.spawn(move || { THREADPOOL.spawn(move || {
sender.send(downloader::cache_image(&pd_)).unwrap(); {
if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
guard.insert(pd_.id());
}
}
let _ = sender.send(downloader::cache_image(&pd_));
{
if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
guard.remove(&pd_.id());
}
}
}); });
let image = image.clone(); let image = image.clone();
let s = size as i32; let s = size as i32;
gtk::timeout_add(50, move || { gtk::timeout_add(25, move || {
if let Ok(path) = receiver.try_recv() { if let Ok(path) = receiver.try_recv() {
if let Ok(path) = path { if let Ok(path) = path {
if let Ok(px) = Pixbuf::new_from_file_at_scale(&path, s, s, true) { if let Ok(px) = Pixbuf::new_from_file_at_scale(&path, s, s, true) {
@ -229,8 +263,8 @@ pub fn time_period_to_duration(time: i64, period: &str) -> Duration {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use hammond_data::Source; // use hammond_data::Source;
use hammond_data::dbqueries; // use hammond_data::dbqueries;
#[test] #[test]
fn test_time_period_to_duration() { fn test_time_period_to_duration() {