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

Wired and implemented the functionality for episde delete button.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-26 14:00:33 +03:00
parent 7989555a87
commit 674b233805
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
4 changed files with 177 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hammond-data/src/models.rs
View File

@ -92,6 +92,12 @@ impl Episode {
pub fn set_length(&mut self, value: Option<i32>) { pub fn set_length(&mut self, value: Option<i32>) {
self.length = value; self.length = value;
} }
pub fn save(&self, db: &Database) -> Result<()> {
let tempdb = db.lock().unwrap();
self.save_changes::<Episode>(&*tempdb)?;
Ok(())
}
} }
#[derive(Queryable, Identifiable, AsChangeset, Associations)] #[derive(Queryable, Identifiable, AsChangeset, Associations)]
@ -139,6 +145,12 @@ impl Podcast {
pub fn set_image_uri(&mut self, value: Option<&str>) { pub fn set_image_uri(&mut self, value: Option<&str>) {
self.image_uri = value.map(|x| x.to_string()); self.image_uri = value.map(|x| x.to_string());
} }
pub fn save(&self, db: &Database) -> Result<()> {
let tempdb = db.lock().unwrap();
self.save_changes::<Podcast>(&*tempdb)?;
Ok(())
}
} }
#[derive(Queryable, Identifiable, AsChangeset)] #[derive(Queryable, Identifiable, AsChangeset)]
@ -191,12 +203,17 @@ impl<'a> Source {
{ {
self.http_etag = etag.map(|x| x.tag().to_string().to_owned()); self.http_etag = etag.map(|x| x.tag().to_string().to_owned());
self.last_modified = lmod.map(|x| format!("{}", x)); self.last_modified = lmod.map(|x| format!("{}", x));
let con = db.lock().unwrap(); self.save(&db)?;
self.save_changes::<Source>(&*con)?;
} }
Ok(()) Ok(())
} }
pub fn save(&self, db: &Database) -> Result<()> {
let tempdb = db.lock().unwrap();
self.save_changes::<Source>(&*tempdb)?;
Ok(())
}
} }
#[derive(Insertable)] #[derive(Insertable)]

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

@ -1,6 +1,5 @@
use reqwest; use reqwest;
use hyper::header::*; use hyper::header::*;
use diesel::prelude::*;
use std::fs::{rename, DirBuilder, File}; use std::fs::{rename, DirBuilder, File};
use std::io::{BufWriter, Read, Write}; use std::io::{BufWriter, Read, Write};
@ -75,11 +74,11 @@ pub fn latest_dl(connection: &Database, limit: u32) -> Result<()> {
} }
}; };
let dl_fold = get_dl_folder(x.title())?; let download_fold = get_download_folder(x.title())?;
// Download the episodes // Download the episodes
eps.iter_mut().for_each(|ep| { eps.iter_mut().for_each(|ep| {
let x = get_episode(connection, ep, &dl_fold); let x = get_episode(connection, ep, &download_fold);
if let Err(err) = x { if let Err(err) = x {
error!("An Error occured while downloading an episode."); error!("An Error occured while downloading an episode.");
error!("Error: {}", err); error!("Error: {}", err);
@ -94,27 +93,25 @@ pub fn latest_dl(connection: &Database, limit: u32) -> Result<()> {
} }
// TODO: Right unit test // TODO: Right unit test
pub fn get_dl_folder(pd_title: &str) -> Result<String> { pub fn get_download_folder(pd_title: &str) -> Result<String> {
// It might be better to make it a hash of the title // It might be better to make it a hash of the title
let dl_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title); let download_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title);
// Create the folder // Create the folder
DirBuilder::new().recursive(true).create(&dl_fold)?; DirBuilder::new().recursive(true).create(&download_fold)?;
Ok(dl_fold) Ok(download_fold)
} }
// TODO: Refactor // TODO: Refactor
pub fn get_episode(connection: &Database, ep: &mut Episode, dl_folder: &str) -> Result<()> { pub fn get_episode(connection: &Database, ep: &mut Episode, download_folder: &str) -> Result<()> {
// Check if its alrdy downloaded // Check if its alrdy downloaded
if ep.local_uri().is_some() { if ep.local_uri().is_some() {
if Path::new(ep.local_uri().unwrap()).exists() { if Path::new(ep.local_uri().unwrap()).exists() {
return Ok(()); return Ok(());
} }
{
let db = connection.lock().unwrap(); ep.set_local_uri(None);
ep.set_local_uri(None); ep.save(connection)?;
ep.save_changes::<Episode>(&*db)?;
}
}; };
// FIXME: Unreliable and hacky way to extract the file extension from the url. // FIXME: Unreliable and hacky way to extract the file extension from the url.
@ -122,7 +119,12 @@ pub fn get_episode(connection: &Database, ep: &mut Episode, dl_folder: &str) ->
// Construct the download path. // Construct the download path.
// TODO: Check if its a valid path // TODO: Check if its a valid path
let dlpath = format!("{}/{}.{}", dl_folder, ep.title().unwrap().to_owned(), ext); let dlpath = format!(
"{}/{}.{}",
download_folder,
ep.title().unwrap().to_owned(),
ext
);
// info!("Downloading {:?} into: {}", y.title(), dlpath); // info!("Downloading {:?} into: {}", y.title(), dlpath);
let uri = ep.uri().to_owned(); let uri = ep.uri().to_owned();
@ -137,8 +139,7 @@ pub fn get_episode(connection: &Database, ep: &mut Episode, dl_folder: &str) ->
// If download succedes set episode local_uri to dlpath. // If download succedes set episode local_uri to dlpath.
ep.set_local_uri(Some(&dlpath)); ep.set_local_uri(Some(&dlpath));
let db = connection.lock().unwrap(); ep.save(connection)?;
ep.save_changes::<Episode>(&*db)?;
Ok(()) Ok(())
} }
@ -154,9 +155,12 @@ pub fn cache_image(title: &str, image_uri: Option<&str>) -> Option<String> {
// FIXME: // FIXME:
let ext = url.split('.').last().unwrap(); let ext = url.split('.').last().unwrap();
let dl_fold = format!("{}{}", HAMMOND_CACHE.to_str().unwrap(), title); let download_fold = format!("{}{}", HAMMOND_CACHE.to_str().unwrap(), title);
DirBuilder::new().recursive(true).create(&dl_fold).unwrap(); DirBuilder::new()
let dlpath = format!("{}/{}.{}", dl_fold, title, ext); .recursive(true)
.create(&download_fold)
.unwrap();
let dlpath = format!("{}/{}.{}", download_fold, title, ext);
if Path::new(&dlpath).exists() { if Path::new(&dlpath).exists() {
return Some(dlpath); return Some(dlpath);

145
hammond-gtk/gtk/episode_widget.ui
View File

@ -10,6 +10,78 @@
<property name="margin_top">5</property> <property name="margin_top">5</property>
<property name="margin_bottom">5</property> <property name="margin_bottom">5</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child>
<object class="GtkButton" id="delete_button">
<property name="name">delete_button</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-delete</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="download_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
<property name="use_fallback">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="play_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
<property name="use_fallback">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -80,78 +152,7 @@
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">5</property> <property name="padding">5</property>
<property name="position">0</property> <property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="name">delete_button</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-delete</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="download_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
<property name="use_fallback">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="play_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
<property name="use_fallback">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>

78
hammond-gtk/src/widgets/episode.rs
View File

@ -11,6 +11,7 @@ use std::thread;
use std::cell::RefCell; use std::cell::RefCell;
use std::sync::mpsc::{channel, Receiver}; use std::sync::mpsc::{channel, Receiver};
use std::path::Path; use std::path::Path;
use std::fs;
use glib; use glib;
use gtk; use gtk;
@ -48,8 +49,9 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::
let builder = gtk::Builder::new_from_string(builder); let builder = gtk::Builder::new_from_string(builder);
let ep: gtk::Box = builder.get_object("episode_box").unwrap(); let ep: gtk::Box = builder.get_object("episode_box").unwrap();
let dl_button: gtk::Button = builder.get_object("download_button").unwrap(); let download_button: gtk::Button = builder.get_object("download_button").unwrap();
let play_button: gtk::Button = builder.get_object("play_button").unwrap(); let play_button: gtk::Button = builder.get_object("play_button").unwrap();
let delete_button: gtk::Button = builder.get_object("delete_button").unwrap();
let title_label: gtk::Label = builder.get_object("title_label").unwrap(); let title_label: gtk::Label = builder.get_object("title_label").unwrap();
let desc_label: gtk::Label = builder.get_object("desc_label").unwrap(); let desc_label: gtk::Label = builder.get_object("desc_label").unwrap();
@ -71,20 +73,31 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::
}); });
} }
// Show play button upon widget initialization. // Show or hide the play/delete/download buttons upon widget initialization.
let local_uri = episode.local_uri(); let local_uri = episode.local_uri();
if local_uri.is_some() && Path::new(local_uri.unwrap()).exists() { if local_uri.is_some() && Path::new(local_uri.unwrap()).exists() {
dl_button.hide(); download_button.hide();
play_button.show(); play_button.show();
delete_button.show();
} }
play_button.connect_clicked(clone!(episode, db => move |_| { play_button.connect_clicked(clone!(episode, db => move |_| {
on_play_bttn_clicked(&db, episode.id()); on_play_bttn_clicked(&db, episode.id());
})); }));
delete_button.connect_clicked(
clone!(episode, db, play_button, download_button => move |del|{
on_delete_bttn_clicked(&db, episode.id());
del.hide();
play_button.hide();
download_button.show();
// TODO: reload the widget
}),
);
let pd_title = pd_title.to_owned(); let pd_title = pd_title.to_owned();
dl_button.connect_clicked(clone!(db, play_button, episode => move |dl| { download_button.connect_clicked(clone!(db, play_button, episode => move |dl| {
on_dl_clicked( on_download_clicked(
&db, &db,
&pd_title, &pd_title,
&mut episode.clone(), &mut episode.clone(),
@ -97,26 +110,26 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::
} }
// TODO: show notification when dl is finished and block play_bttn till then. // TODO: show notification when dl is finished and block play_bttn till then.
fn on_dl_clicked( fn on_download_clicked(
db: &Database, db: &Database,
pd_title: &str, pd_title: &str,
ep: &mut Episode, ep: &mut Episode,
dl_bttn: &gtk::Button, download_bttn: &gtk::Button,
play_bttn: &gtk::Button, play_bttn: &gtk::Button,
) { ) {
// Create a async channel. // Create a async channel.
let (sender, receiver) = channel(); let (sender, receiver) = channel();
// Pass the desired arguments into the Local Thread Storage. // Pass the desired arguments into the Local Thread Storage.
GLOBAL.with(clone!(dl_bttn, play_bttn => move |global| { GLOBAL.with(clone!(download_bttn, play_bttn => move |global| {
*global.borrow_mut() = Some((dl_bttn, play_bttn, receiver)); *global.borrow_mut() = Some((download_bttn, play_bttn, receiver));
})); }));
let pd_title = pd_title.to_owned(); let pd_title = pd_title.to_owned();
let mut ep = ep.clone(); let mut ep = ep.clone();
thread::spawn(clone!(db => move || { thread::spawn(clone!(db => move || {
let dl_fold = downloader::get_dl_folder(&pd_title).unwrap(); let download_fold = downloader::get_download_folder(&pd_title).unwrap();
let e = downloader::get_episode(&db, &mut ep, dl_fold.as_str()); let e = downloader::get_episode(&db, &mut ep, download_fold.as_str());
if let Err(err) = e { if let Err(err) = e {
error!("Error while trying to download: {}", ep.uri()); error!("Error while trying to download: {}", ep.uri());
error!("Error: {}", err); error!("Error: {}", err);
@ -132,9 +145,7 @@ fn on_play_bttn_clicked(db: &Database, episode_id: i32) {
dbqueries::get_episode_local_uri(&tempdb, episode_id).unwrap() dbqueries::get_episode_local_uri(&tempdb, episode_id).unwrap()
}; };
if local_uri.is_some() { if let Some(uri) = local_uri {
let uri = local_uri.unwrap().to_owned();
if Path::new(&uri).exists() { if Path::new(&uri).exists() {
info!("Opening {}", uri); info!("Opening {}", uri);
let e = open::that(&uri); let e = open::that(&uri);
@ -151,11 +162,46 @@ fn on_play_bttn_clicked(db: &Database, episode_id: i32) {
} }
} }
fn on_delete_bttn_clicked(db: &Database, episode_id: i32) {
let mut ep = {
let tempdb = db.lock().unwrap();
dbqueries::get_episode(&tempdb, episode_id).unwrap()
};
let ep2 = ep.clone();
let local_uri = ep2.local_uri();
if local_uri.is_some() {
let uri = local_uri.unwrap().to_owned();
if Path::new(&uri).exists() {
let res = fs::remove_file(&uri);
if res.is_ok() {
ep.set_local_uri(None);
let res2 = ep.save(db);
if res2.is_ok() {
info!("Deleted file at: {}", uri);
} else {
error!("Error while trying to delete file: {}", uri);
error!("Error: {}", res2.unwrap_err());
}
} else {
error!("Error while trying to delete file: {}", uri);
error!("Error: {}", res.unwrap_err());
};
}
} else {
error!(
"Something went wrong evaluating the following path: {:?}",
local_uri
);
}
}
fn receive() -> glib::Continue { fn receive() -> glib::Continue {
GLOBAL.with(|global| { GLOBAL.with(|global| {
if let Some((ref dl_bttn, ref play_bttn, ref reciever)) = *global.borrow() { if let Some((ref download_bttn, ref play_bttn, ref reciever)) = *global.borrow() {
if reciever.try_recv().is_ok() { if reciever.try_recv().is_ok() {
dl_bttn.hide(); download_bttn.hide();
play_bttn.show(); play_bttn.show();
} }
} }