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

EpisodesView: Custom Diesel model not really necessary.

Browse Source
This commit is contained in:
Jordan Petridis
2017-12-19 20:45:40 +02:00
parent 895591f628
commit 914cad72f5
5 changed files with 17 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hammond-gtk/src/utils.rs
+1
View File
@@ -60,6 +60,7 @@ fn refresh_podcasts_view() -> glib::Continue {
}
// FIXME: use something that would just scale?
// TODO: make a diesel model with only title, local_uri
pub fn get_pixbuf_from_path(pd: &Podcast) -> Option<Pixbuf> {
let img_path = downloader::cache_image(pd)?;
hammond-gtk/src/views/episodes.rs
+11 -10
View File
@@ -2,7 +2,7 @@ use gtk;
use gtk::prelude::*;
use hammond_data::dbqueries;
use hammond_data::EpisodeViewWidgetQuery;
use hammond_data::EpisodeWidgetQuery;
use widgets::episode::EpisodeWidget;
use utils::get_pixbuf_from_path_64;
@@ -32,7 +32,7 @@ impl EpisodesView {
pub fn new() -> Rc<EpisodesView> {
let view = EpisodesView::default();
let episodes = dbqueries::get_episodes_view_widgets_with_limit(100).unwrap();
let episodes = dbqueries::get_episodes_widgets_with_limit(100).unwrap();
let frame = gtk::Frame::new(None);
let list = gtk::ListBox::new();
@@ -45,8 +45,8 @@ impl EpisodesView {
list.set_visible(true);
list.set_selection_mode(gtk::SelectionMode::None);
episodes.into_iter().for_each(|ep| {
let viewep = EpisodesViewWidget::new(ep);
episodes.into_iter().for_each(|mut ep| {
let viewep = EpisodesViewWidget::new(&mut ep);
list.add(&viewep.container);
let sep = gtk::Separator::new(gtk::Orientation::Vertical);
@@ -86,20 +86,21 @@ impl Default for EpisodesViewWidget {
}
impl EpisodesViewWidget {
fn new(episode: EpisodeViewWidgetQuery) -> EpisodesViewWidget {
fn new(episode: &mut EpisodeWidgetQuery) -> EpisodesViewWidget {
let builder =
gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view_widget.ui");
let container: gtk::Box = builder.get_object("container").unwrap();
let image: gtk::Image = builder.get_object("cover").unwrap();
// FIXME:
let pd = dbqueries::get_podcast_from_id(episode.podcast_id()).unwrap();
let img = get_pixbuf_from_path_64(&pd);
if let Some(i) = img {
image.set_from_pixbuf(&i);
if let Ok(pd) = dbqueries::get_podcast_from_id(episode.podcast_id()) {
let img = get_pixbuf_from_path_64(&pd);
if let Some(i) = img {
image.set_from_pixbuf(&i);
}
}
let ep = EpisodeWidget::new(&mut episode.into());
let ep = EpisodeWidget::new(episode);
container.pack_start(&ep.container, true, true, 5);
EpisodesViewWidget {