Implemented a downloaded/watched cleaner.

This commit is contained in:
Jordan Petridis 2017-10-28 06:57:32 +03:00
parent 86c686bba6
commit eb8fdb2edb
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
7 changed files with 120 additions and 30 deletions

1
Cargo.lock generated
View File

@ -618,6 +618,7 @@ dependencies = [
name = "hammond-data"
version = "0.1.0"
dependencies = [
"chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",

View File

@ -16,6 +16,7 @@ diesel_codegen = { version = "0.16", features = ["sqlite"] }
xdg = "2.1"
lazy_static = "0.2"
rss = "1.1"
chrono = "0.4"
# overwrite diesel dependancy that disables a feature rss depends upon
dotenv = "*"

View File

@ -0,0 +1,81 @@
use rayon::prelude::*;
use errors::*;
use dbqueries;
use index_feed::Database;
use models::Episode;
use chrono::prelude::*;
use std::path::Path;
use std::fs;
// TODO: Write unit test.
pub fn download_checker(db: Database) -> Result<()> {
let mut episodes = {
let tempdb = db.lock().unwrap();
dbqueries::get_downloaded_episodes(&tempdb)?
};
episodes.par_iter_mut().for_each(|ep| {
if ep.local_uri().is_some() {
if !Path::new(ep.local_uri().unwrap()).exists() {
ep.set_local_uri(None);
let res = ep.save(&db.clone());
if let Err(err) = res {
error!("Error while trying to update episode: {:#?}", ep);
error!("Error: {}", err);
};
}
}
});
Ok(())
}
// TODO: Write unit test.
pub fn watched_cleaner(db: &Database) -> Result<()> {
let mut episodes = {
let tempdb = db.lock().unwrap();
dbqueries::get_watched_episodes(&tempdb)?
};
let now_utc = Utc::now().timestamp() as i32;
episodes.par_iter_mut().for_each(|mut ep| {
if ep.local_uri().is_some() && ep.watched().is_some() {
let watched = ep.watched().unwrap().clone();
// TODO: expose a config and a user set option.
let limit = watched + 172_800; // add 2days in seconds
if now_utc > limit {
let e = delete_local_content(db, &mut ep);
if let Err(err) = e {
error!("Error while trying to delete file: {:?}", ep.local_uri());
error!("Error: {}", err);
};
}
}
});
Ok(())
}
// TODO: Write unit test.
pub fn delete_local_content(db: &Database, ep: &mut Episode) -> Result<()> {
if ep.local_uri().is_some() {
let uri = ep.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);
ep.save(db)?;
} else {
error!("Error while trying to delete file: {}", uri);
error!("Error: {}", res.unwrap_err());
};
}
} else {
error!(
"Something went wrong evaluating the following path: {:?}",
ep.local_uri(),
);
}
Ok(())
}

View File

@ -37,6 +37,20 @@ pub fn get_episodes(con: &SqliteConnection) -> QueryResult<Vec<Episode>> {
eps
}
pub fn get_downloaded_episodes(con: &SqliteConnection) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let eps = episode.filter(local_uri.is_not_null()).load::<Episode>(con);
eps
}
pub fn get_watched_episodes(con: &SqliteConnection) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let eps = episode.filter(watched.is_not_null()).load::<Episode>(con);
eps
}
pub fn get_episode(con: &SqliteConnection, ep_id: i32) -> QueryResult<Episode> {
use schema::episode::dsl::*;
@ -44,7 +58,10 @@ pub fn get_episode(con: &SqliteConnection, ep_id: i32) -> QueryResult<Episode> {
ep
}
pub fn get_episode_local_uri(con: &SqliteConnection, ep_id: i32) -> QueryResult<Option<String>> {
pub fn get_episode_from_local_uri(
con: &SqliteConnection,
ep_id: i32,
) -> QueryResult<Option<String>> {
use schema::episode::dsl::*;
let ep = episode

View File

@ -16,6 +16,7 @@ extern crate diesel;
#[macro_use]
extern crate diesel_codegen;
extern crate chrono;
extern crate hyper;
extern crate rayon;
extern crate reqwest;
@ -24,6 +25,7 @@ extern crate rss;
extern crate xdg;
pub mod dbqueries;
pub mod dbcheckup;
pub mod models;
pub mod index_feed;
pub mod errors;

View File

@ -17,9 +17,11 @@ pub struct Episode {
local_uri: Option<String>,
description: Option<String>,
published_date: Option<String>,
/// Representation of system time. Should be in UTC.
epoch: i32,
length: Option<i32>,
guid: Option<String>,
/// Represent the epoch value of when the episode was last watched.
watched: Option<i32>,
podcast_id: i32,
}
@ -94,6 +96,14 @@ impl Episode {
self.length = value;
}
pub fn watched(&self) -> Option<i32> {
self.watched
}
pub fn set_watched(&mut self, value: Option<i32>) {
self.watched = value;
}
pub fn save(&self, db: &Database) -> Result<()> {
let tempdb = db.lock().unwrap();
self.save_changes::<Episode>(&*tempdb)?;

View File

@ -4,6 +4,7 @@ use hammond_data::dbqueries;
use hammond_data::models::Episode;
use hammond_downloader::downloader;
use hammond_data::index_feed::Database;
use hammond_data::dbcheckup::delete_local_content;
use dissolve::strip_html_tags;
@ -11,7 +12,6 @@ use std::thread;
use std::cell::RefCell;
use std::sync::mpsc::{channel, Receiver};
use std::path::Path;
use std::fs;
use glib;
use gtk;
@ -141,7 +141,7 @@ fn on_download_clicked(
fn on_play_bttn_clicked(db: &Database, episode_id: i32) {
let local_uri = {
let tempdb = db.lock().unwrap();
dbqueries::get_episode_local_uri(&tempdb, episode_id).unwrap()
dbqueries::get_episode_from_local_uri(&tempdb, episode_id).unwrap()
};
if let Some(uri) = local_uri {
@ -167,33 +167,11 @@ fn on_delete_bttn_clicked(db: &Database, episode_id: i32) {
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
);
}
let e = delete_local_content(db, &mut ep);
if let Err(err) = e {
error!("Error while trying to delete file: {:?}", ep.local_uri());
error!("Error: {}", err);
};
}
fn receive() -> glib::Continue {