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

Move get_pixbuf_from_path into hammond_gtk/src/utils.rs module.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-30 21:38:21 +02:00
parent bf240a00f4
commit 94879b4256
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,10 @@
use glib;
use gtk;
use gdk_pixbuf::Pixbuf;
use hammond_data::feed;
use hammond_data::Source;
use hammond_data::{Podcast, Source};
use hammond_downloader::downloader;
use std::{thread, time};
use std::cell::RefCell;
@ -61,3 +63,40 @@ fn refresh_podcasts_view() -> glib::Continue {
});
glib::Continue(false)
}
pub fn get_pixbuf_from_path(pd: &Podcast) -> Option<Pixbuf> {
let img_path = downloader::cache_image(pd);
if let Some(i) = img_path {
Pixbuf::new_from_file_at_scale(&i, 256, 256, true).ok()
} else {
None
}
}
#[cfg(test)]
mod tests {
use hammond_data::Source;
use hammond_data::feed::index;
use hammond_data::dbqueries;
use diesel::Identifiable;
use super::*;
#[test]
fn test_get_pixbuf_from_path() {
let url = "http://www.newrustacean.com/feed.xml";
// Create and index a source
let source = Source::from_url(url).unwrap();
// Copy it's id
let sid = source.id().clone();
// Convert Source it into a Feed and index it
let feed = source.into_feed().unwrap();
index(vec![feed]);
// Get the Podcast
let pd = dbqueries::get_podcast_from_source_id(sid).unwrap();
let pxbuf = get_pixbuf_from_path(&pd);
assert!(pxbuf.is_some());
}
}

1
hammond-gtk/src/views/podcasts.rs
View File

@ -7,6 +7,7 @@ use hammond_data::dbqueries;
use hammond_data::Podcast;
use widgets::podcast::*;
use utils::get_pixbuf_from_path;
fn setup_empty_view(stack: &gtk::Stack) {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_view.ui");

38
hammond-gtk/src/widgets/podcast.rs
View File

@ -1,6 +1,5 @@
use gtk::prelude::*;
use gtk;
use gdk_pixbuf::Pixbuf;
use std::fs;
@ -10,6 +9,7 @@ use hammond_downloader::downloader;
use widgets::episode::episodes_listbox;
use views::podcasts::update_podcasts_view;
use utils::get_pixbuf_from_path;
#[derive(Debug)]
struct PodcastWidget {
@ -154,15 +154,6 @@ fn show_played_button(pd: &Podcast, played_button: &gtk::Button) {
}
}
pub fn get_pixbuf_from_path(pd: &Podcast) -> Option<Pixbuf> {
let img_path = downloader::cache_image(pd);
if let Some(i) = img_path {
Pixbuf::new_from_file_at_scale(&i, 256, 256, true).ok()
} else {
None
}
}
pub fn setup_podcast_widget(stack: &gtk::Stack) {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcast_widget.ui");
let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap();
@ -180,30 +171,3 @@ pub fn update_podcast_widget(stack: &gtk::Stack, pd: &Podcast) {
stack.set_visible_child_name(&vis);
old.destroy();
}
#[cfg(test)]
mod tests {
use hammond_data::Source;
use hammond_data::feed::index;
use diesel::Identifiable;
use super::*;
#[test]
fn test_get_pixbuf_from_path() {
let url = "http://www.newrustacean.com/feed.xml";
// Create and index a source
let source = Source::from_url(url).unwrap();
// Copy it's id
let sid = source.id().clone();
// Convert Source it into a Feed and index it
let feed = source.into_feed().unwrap();
index(vec![feed]);
// Get the Podcast
let pd = dbqueries::get_podcast_from_source_id(sid).unwrap();
let pxbuf = get_pixbuf_from_path(&pd);
assert!(pxbuf.is_some());
}
}