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

Incoplete dl_button wiring.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-18 03:36:07 +03:00
parent 80f0f138f3
commit 5d01b735d6
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hammond-downloader/src/downloader.rs
View File

@ -69,7 +69,7 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
dbqueries::get_pd_episodes_limit(connection, x, limit)?
};
let dl_fold = get_dl_folder(x)?;
let dl_fold = get_dl_folder(x.title())?;
// Download the episodes
let _ :Vec<_> = eps.iter_mut()
@ -87,9 +87,9 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
}
// TODO: Right unit test
fn get_dl_folder(pd: &Podcast) -> Result<String> {
pub fn get_dl_folder(pd_title: &str) -> Result<String> {
// It might be better to make it a hash of the title
let dl_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd.title());
let dl_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title);
// Create the folder
// TODO: handle the unwrap properly
@ -97,7 +97,7 @@ fn get_dl_folder(pd: &Podcast) -> Result<String> {
Ok(dl_fold)
}
fn get_episode(connection: &SqliteConnection, ep: &mut Episode, dl_folder: &str) -> Result<()> {
pub fn get_episode(connection: &SqliteConnection, ep: &mut Episode, dl_folder: &str) -> Result<()> {
// Check if its alrdy downloaded
if ep.local_uri().is_some() {
if Path::new(ep.local_uri().unwrap()).exists() {

21
hammond-gtk/src/main.rs
View File

@ -17,6 +17,7 @@ use log::LogLevel;
use diesel::prelude::*;
use hammond_data::dbqueries;
use hammond_data::models::Episode;
use hammond_downloader::downloader;
use std::rc;
use std::thread;
@ -111,7 +112,7 @@ fn podcast_widget(
pd_widget
}
fn epidose_widget(episode: &Episode) -> gtk::Box {
fn epidose_widget(connection: &SqliteConnection, episode: &mut Episode, pd_title: &str) -> gtk::Box {
// This is just a prototype and will be reworked probably.
let builder = include_str!("../gtk/EpisodeWidget.ui");
let builder = gtk::Builder::new_from_string(builder);
@ -146,16 +147,26 @@ fn epidose_widget(episode: &Episode) -> gtk::Box {
});
}
let pd_title_cloned = pd_title.clone().to_owned();
// let db = rc::Rc::new(connection);
dl_button.connect_clicked(move |_| {
// ugly hack to bypass the borrowchecker
let pd_title = pd_title_cloned.clone();
thread::spawn(move || {
let dl_fold = downloader::get_dl_folder(&pd_title);
});
});
ep
}
fn episodes_listbox(connection: &SqliteConnection, pd_title: &str) -> gtk::ListBox {
let pd = dbqueries::load_podcast(connection, pd_title).unwrap();
let episodes = dbqueries::get_pd_episodes(connection, &pd).unwrap();
let mut episodes = dbqueries::get_pd_episodes(connection, &pd).unwrap();
let list = gtk::ListBox::new();
episodes.iter().for_each(|ep| {
let w = epidose_widget(ep);
episodes.iter_mut().for_each(|ep| {
let w = epidose_widget(connection, ep, pd_title);
list.add(&w)
});
@ -245,7 +256,7 @@ fn build_ui() {
let description = pd_model.get_value(&iter, 2).get::<String>().unwrap();
let image_uri = pd_model.get_value(&iter, 4).get::<String>();
let imgpath = hammond_downloader::downloader::cache_image(
let imgpath = downloader::cache_image(
&title,
image_uri.as_ref().map(|s| s.as_str()),
);