podcasts_view further refactoring.

This commit is contained in:
Jordan Petridis
2017-10-18 22:24:05 +03:00
parent 0ed6fee39f
commit 70d1f44147
9 changed files with 112 additions and 90 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
use open;
use diesel::prelude::*;
use diesel::prelude::SqliteConnection;
use hammond_data::dbqueries;
use hammond_data::models::Episode;
use hammond_downloader::downloader;
@@ -37,7 +37,7 @@ fn epidose_widget(
desc_label.set_text(d);
}
if let Some(_) = episode.local_uri() {
if episode.local_uri().is_some() {
dl_button.hide();
play_button.show();
let uri = episode.local_uri().unwrap().to_owned();
+4 -3
View File
@@ -2,7 +2,7 @@ use gtk::prelude::*;
use gtk;
use gdk_pixbuf::Pixbuf;
use diesel::prelude::*;
use diesel::prelude::SqliteConnection;
use hammond_data::dbqueries;
use std::sync::{Arc, Mutex};
@@ -39,12 +39,11 @@ pub fn podcast_widget(
cover.set_from_pixbuf(&i);
}
// (pd_widget, title_label, desc_label, cover)
pd_widget
}
pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxChild {
let build_src = include_str!("../../gtk/pd_fb_child.ui");
let build_src = include_str!("../../gtk/podcasts_child.ui");
let builder = gtk::Builder::new_from_string(build_src);
// Copy of gnome-music AlbumWidget
@@ -67,6 +66,7 @@ pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxC
let fbc = gtk::FlowBoxChild::new();
fbc.add(&box_);
info!("flowbox child created");
fbc
}
@@ -75,6 +75,7 @@ pub fn podcast_liststore(connection: &SqliteConnection) -> gtk::ListStore {
let builder = gtk::Builder::new_from_string(builder);
let podcast_model: gtk::ListStore = builder.get_object("pd_store").unwrap();
// TODO: handle unwrap.
let podcasts = dbqueries::get_podcasts(connection).unwrap();
for pd in &podcasts {