diff --git a/Cargo.lock b/Cargo.lock index 6c1d6ad..604f560 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -617,6 +617,8 @@ dependencies = [ "diesel_migrations 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -628,7 +630,6 @@ dependencies = [ "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", "rfc822_sanitizer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rss 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -642,6 +643,8 @@ name = "hammond-downloader" version = "0.1.0" dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "hammond-data 0.1.0", "hyper 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -657,6 +660,8 @@ version = "0.1.0" dependencies = [ "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dissolve 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "gdk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/hammond-data/Cargo.toml b/hammond-data/Cargo.toml index 01e42cf..286743d 100644 --- a/hammond-data/Cargo.toml +++ b/hammond-data/Cargo.toml @@ -14,7 +14,6 @@ itertools = "0.7.6" lazy_static = "1.0.0" log = "0.4.1" rayon = "0.9.0" -reqwest = "0.8.4" rfc822_sanitizer = "0.3.3" rss = "1.2.1" url = "1.6.0" @@ -26,6 +25,8 @@ hyper-tls = "0.1.2" native-tls = "0.1.5" futures-cpupool = "0.1.8" num_cpus = "1.8.0" +failure = "0.1.1" +failure_derive = "0.1.1" [dependencies.diesel] features = ["sqlite", "r2d2"] diff --git a/hammond-data/src/database.rs b/hammond-data/src/database.rs index 0a37aaa..d6e5be0 100644 --- a/hammond-data/src/database.rs +++ b/hammond-data/src/database.rs @@ -7,7 +7,7 @@ use diesel::r2d2::ConnectionManager; use std::io; use std::path::PathBuf; -use errors::*; +use errors::DataError; #[cfg(not(test))] use xdg_dirs; @@ -57,7 +57,7 @@ fn init_pool(db_path: &str) -> Pool { pool } -fn run_migration_on(connection: &SqliteConnection) -> Result<()> { +fn run_migration_on(connection: &SqliteConnection) -> Result<(), DataError> { info!("Running DB Migrations..."); // embedded_migrations::run(connection)?; embedded_migrations::run_with_output(connection, &mut io::stdout()).map_err(From::from) @@ -66,7 +66,7 @@ fn run_migration_on(connection: &SqliteConnection) -> Result<()> { /// Reset the database into a clean state. // Test share a Temp file db. #[allow(dead_code)] -pub fn truncate_db() -> Result<()> { +pub fn truncate_db() -> Result<(), DataError> { let db = connection(); let con = db.get()?; con.execute("DELETE FROM episode")?; diff --git a/hammond-data/src/dbqueries.rs b/hammond-data/src/dbqueries.rs index 7fe277f..27c46f7 100644 --- a/hammond-data/src/dbqueries.rs +++ b/hammond-data/src/dbqueries.rs @@ -8,10 +8,10 @@ use diesel::dsl::exists; use diesel::select; use database::connection; -use errors::*; +use errors::DataError; use models::*; -pub fn get_sources() -> Result> { +pub fn get_sources() -> Result, DataError> { use schema::source::dsl::*; let db = connection(); let con = db.get()?; @@ -22,7 +22,7 @@ pub fn get_sources() -> Result> { .map_err(From::from) } -pub fn get_podcasts() -> Result> { +pub fn get_podcasts() -> Result, DataError> { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -33,7 +33,7 @@ pub fn get_podcasts() -> Result> { .map_err(From::from) } -pub fn get_episodes() -> Result> { +pub fn get_episodes() -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -44,7 +44,7 @@ pub fn get_episodes() -> Result> { .map_err(From::from) } -pub(crate) fn get_downloaded_episodes() -> Result> { +pub(crate) fn get_downloaded_episodes() -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -56,7 +56,7 @@ pub(crate) fn get_downloaded_episodes() -> Result> { .map_err(From::from) } -// pub(crate) fn get_played_episodes() -> Result> { +// pub(crate) fn get_played_episodes() -> Result, DataError> { // use schema::episode::dsl::*; // let db = connection(); @@ -67,7 +67,7 @@ pub(crate) fn get_downloaded_episodes() -> Result> { // .map_err(From::from) // } -pub(crate) fn get_played_cleaner_episodes() -> Result> { +pub(crate) fn get_played_cleaner_episodes() -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -79,7 +79,7 @@ pub(crate) fn get_played_cleaner_episodes() -> Result> .map_err(From::from) } -pub fn get_episode_from_rowid(ep_id: i32) -> Result { +pub fn get_episode_from_rowid(ep_id: i32) -> Result { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -90,7 +90,7 @@ pub fn get_episode_from_rowid(ep_id: i32) -> Result { .map_err(From::from) } -pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result> { +pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -102,7 +102,7 @@ pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result> { .map_err(From::from) } -pub fn get_episodes_widgets_with_limit(limit: u32) -> Result> { +pub fn get_episodes_widgets_with_limit(limit: u32) -> Result, DataError> { use schema::episode; let db = connection(); let con = db.get()?; @@ -125,7 +125,7 @@ pub fn get_episodes_widgets_with_limit(limit: u32) -> Result Result { +pub fn get_podcast_from_id(pid: i32) -> Result { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -136,7 +136,7 @@ pub fn get_podcast_from_id(pid: i32) -> Result { .map_err(From::from) } -pub fn get_podcast_cover_from_id(pid: i32) -> Result { +pub fn get_podcast_cover_from_id(pid: i32) -> Result { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -148,7 +148,7 @@ pub fn get_podcast_cover_from_id(pid: i32) -> Result { .map_err(From::from) } -pub fn get_pd_episodes(parent: &Podcast) -> Result> { +pub fn get_pd_episodes(parent: &Podcast) -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -159,7 +159,7 @@ pub fn get_pd_episodes(parent: &Podcast) -> Result> { .map_err(From::from) } -pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result> { +pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -172,7 +172,7 @@ pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result Result> { +pub fn get_pd_unplayed_episodes(parent: &Podcast) -> Result, DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -184,8 +184,8 @@ pub fn get_pd_unplayed_episodes(parent: &Podcast) -> Result> { .map_err(From::from) } -// pub(crate) fn get_pd_episodes_limit(parent: &Podcast, limit: u32) -> Result> { -// use schema::episode::dsl::*; +// pub(crate) fn get_pd_episodes_limit(parent: &Podcast, limit: u32) -> +// Result, DataError> { use schema::episode::dsl::*; // let db = connection(); // let con = db.get()?; @@ -197,7 +197,7 @@ pub fn get_pd_unplayed_episodes(parent: &Podcast) -> Result> { // .map_err(From::from) // } -pub fn get_source_from_uri(uri_: &str) -> Result { +pub fn get_source_from_uri(uri_: &str) -> Result { use schema::source::dsl::*; let db = connection(); let con = db.get()?; @@ -208,7 +208,7 @@ pub fn get_source_from_uri(uri_: &str) -> Result { .map_err(From::from) } -pub fn get_source_from_id(id_: i32) -> Result { +pub fn get_source_from_id(id_: i32) -> Result { use schema::source::dsl::*; let db = connection(); let con = db.get()?; @@ -219,7 +219,7 @@ pub fn get_source_from_id(id_: i32) -> Result { .map_err(From::from) } -pub fn get_podcast_from_source_id(sid: i32) -> Result { +pub fn get_podcast_from_source_id(sid: i32) -> Result { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -230,7 +230,7 @@ pub fn get_podcast_from_source_id(sid: i32) -> Result { .map_err(From::from) } -pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result { +pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -242,7 +242,10 @@ pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result { .map_err(From::from) } -pub(crate) fn get_episode_minimal_from_pk(title_: &str, pid: i32) -> Result { +pub(crate) fn get_episode_minimal_from_pk( + title_: &str, + pid: i32, +) -> Result { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -255,11 +258,11 @@ pub(crate) fn get_episode_minimal_from_pk(title_: &str, pid: i32) -> Result Result<()> { +pub(crate) fn remove_feed(pd: &Podcast) -> Result<(), DataError> { let db = connection(); let con = db.get()?; - con.transaction(|| -> Result<()> { + con.transaction(|| { delete_source(&con, pd.source_id())?; delete_podcast(&con, pd.id())?; delete_podcast_episodes(&con, pd.id())?; @@ -286,7 +289,7 @@ fn delete_podcast_episodes(con: &SqliteConnection, parent_id: i32) -> QueryResul diesel::delete(episode.filter(podcast_id.eq(parent_id))).execute(con) } -pub fn source_exists(url: &str) -> Result { +pub fn source_exists(url: &str) -> Result { use schema::source::dsl::*; let db = connection(); @@ -297,7 +300,7 @@ pub fn source_exists(url: &str) -> Result { .map_err(From::from) } -pub(crate) fn podcast_exists(source_id_: i32) -> Result { +pub(crate) fn podcast_exists(source_id_: i32) -> Result { use schema::podcast::dsl::*; let db = connection(); @@ -309,7 +312,7 @@ pub(crate) fn podcast_exists(source_id_: i32) -> Result { } #[cfg_attr(rustfmt, rustfmt_skip)] -pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result { +pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result { use schema::episode::dsl::*; let db = connection(); @@ -320,7 +323,7 @@ pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result { .map_err(From::from) } -pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<()> { +pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<(), DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -332,13 +335,13 @@ pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<()> { .map(|_| ()) } -pub fn update_none_to_played_now(parent: &Podcast) -> Result { +pub fn update_none_to_played_now(parent: &Podcast) -> Result { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; let epoch_now = Utc::now().timestamp() as i32; - con.transaction(|| -> Result { + con.transaction(|| { diesel::update(Episode::belonging_to(parent).filter(played.is_null())) .set(played.eq(Some(epoch_now))) .execute(&con) diff --git a/hammond-data/src/errors.rs b/hammond-data/src/errors.rs index 6a2d00c..ccddd85 100644 --- a/hammond-data/src/errors.rs +++ b/hammond-data/src/errors.rs @@ -3,23 +3,105 @@ use diesel::r2d2; use diesel_migrations::RunMigrationsError; use hyper; use native_tls; -use reqwest; -use rss; +// use rss; use url; use std::io; +// use std::fmt; -error_chain! { - foreign_links { - DieselResultError(diesel::result::Error); - DieselMigrationError(RunMigrationsError); - R2D2Error(r2d2::Error); - R2D2PoolError(r2d2::PoolError); - RSSError(rss::Error); - ReqError(reqwest::Error); - HyperError(hyper::Error); - UrlError(url::ParseError); - TLSError(native_tls::Error); - IoError(io::Error); +// fadsadfs NOT SYNC +// #[derive(Fail, Debug)] +// #[fail(display = "RSS Error: {}", _0)] +// struct RSSError(rss::Error); + +#[derive(Fail, Debug)] +pub enum DataError { + #[fail(display = "SQL Query failed: {}", _0)] + DieselResultError(#[cause] diesel::result::Error), + #[fail(display = "Database Migration error: {}", _0)] + DieselMigrationError(#[cause] RunMigrationsError), + #[fail(display = "R2D2 error: {}", _0)] + R2D2Error(#[cause] r2d2::Error), + #[fail(display = "R2D2 Pool error: {}", _0)] + R2D2PoolError(#[cause] r2d2::PoolError), + #[fail(display = "Hyper Error: {}", _0)] + HyperError(#[cause] hyper::Error), + #[fail(display = "Failed to parse a url: {}", _0)] + // TODO: print the url too + UrlError(#[cause] url::ParseError), + #[fail(display = "TLS Error: {}", _0)] + TLSError(#[cause] native_tls::Error), + #[fail(display = "IO Error: {}", _0)] + IOError(#[cause] io::Error), + #[fail(display = "RSS Error: {}", _0)] + // Rss::Error is not yet Sync + RssCrateError(String), + #[fail(display = "Error: {}", _0)] + Bail(String), + #[fail(display = "Request to {} returned {}. Context: {}", url, status_code, context)] + HttpStatusError { + url: String, + status_code: hyper::StatusCode, + context: String, + }, + #[fail(display = "Error occured while Parsing an Episode. Reason: {}", reason)] + ParseEpisodeError { reason: String, parent_id: i32 }, + #[fail(display = "No Futures where produced to be run.")] + EmptyFuturesList, + #[fail(display = "Episode was not changed and thus skipped.")] + EpisodeNotChanged, +} + +impl From for DataError { + fn from(err: RunMigrationsError) -> Self { + DataError::DieselMigrationError(err) + } +} + +impl From for DataError { + fn from(err: diesel::result::Error) -> Self { + DataError::DieselResultError(err) + } +} + +impl From for DataError { + fn from(err: r2d2::Error) -> Self { + DataError::R2D2Error(err) + } +} + +impl From for DataError { + fn from(err: r2d2::PoolError) -> Self { + DataError::R2D2PoolError(err) + } +} + +impl From for DataError { + fn from(err: hyper::Error) -> Self { + DataError::HyperError(err) + } +} + +impl From for DataError { + fn from(err: url::ParseError) -> Self { + DataError::UrlError(err) + } +} + +impl From for DataError { + fn from(err: native_tls::Error) -> Self { + DataError::TLSError(err) + } +} + +impl From for DataError { + fn from(err: io::Error) -> Self { + DataError::IOError(err) + } +} + +impl From for DataError { + fn from(err: String) -> Self { + DataError::Bail(err) } } diff --git a/hammond-data/src/feed.rs b/hammond-data/src/feed.rs index 9f39cd0..151234d 100644 --- a/hammond-data/src/feed.rs +++ b/hammond-data/src/feed.rs @@ -5,7 +5,7 @@ use itertools::{Either, Itertools}; use rss; use dbqueries; -use errors::*; +use errors::DataError; use models::{Index, IndexState, Update}; use models::{NewEpisode, NewPodcast, Podcast}; use pipeline::*; @@ -26,7 +26,7 @@ pub struct Feed { impl Feed { /// Index the contents of the RSS `Feed` into the database. - pub fn index(self) -> Box + Send> { + pub fn index(self) -> Box + Send> { let fut = self.parse_podcast_async() .and_then(|pd| pd.to_podcast()) .and_then(move |pd| self.index_channel_items(&pd)); @@ -38,22 +38,25 @@ impl Feed { NewPodcast::new(&self.channel, self.source_id) } - fn parse_podcast_async(&self) -> Box + Send> { + fn parse_podcast_async(&self) -> Box + Send> { Box::new(ok(self.parse_podcast())) } - fn index_channel_items(&self, pd: &Podcast) -> Box + Send> { + fn index_channel_items( + &self, + pd: &Podcast, + ) -> Box + Send> { let fut = self.get_stuff(pd) .and_then(|(insert, update)| { if !insert.is_empty() { info!("Indexing {} episodes.", insert.len()); if let Err(err) = dbqueries::index_new_episodes(insert.as_slice()) { error!("Failed batch indexng, Fallign back to individual indexing."); - error!("Error: {}", err); + error!("{}", err); insert.iter().for_each(|ep| { if let Err(err) = ep.index() { error!("Failed to index episode: {:?}.", ep.title()); - error!("Error msg: {}", err); + error!("{}", err); }; }) } @@ -70,7 +73,7 @@ impl Feed { .for_each(|(ref ep, rowid)| { if let Err(err) = ep.update(rowid) { error!("Failed to index episode: {:?}.", ep.title()); - error!("Error msg: {}", err); + error!("{}", err); }; }) } @@ -79,7 +82,10 @@ impl Feed { Box::new(fut) } - fn get_stuff(&self, pd: &Podcast) -> Box + Send> { + fn get_stuff( + &self, + pd: &Podcast, + ) -> Box + Send> { let (insert, update): (Vec<_>, Vec<_>) = self.channel .items() .into_iter() @@ -90,7 +96,7 @@ impl Feed { // I am not sure what the optimizations are on match vs allocating None. .map(|fut| { fut.and_then(|x| match x { - IndexState::NotChanged => bail!("Nothing to do here."), + IndexState::NotChanged => return Err(DataError::EpisodeNotChanged), _ => Ok(x), }) }) diff --git a/hammond-data/src/lib.rs b/hammond-data/src/lib.rs index 399d119..52e58d3 100644 --- a/hammond-data/src/lib.rs +++ b/hammond-data/src/lib.rs @@ -6,9 +6,6 @@ wrong_pub_self_convention, mut_mut, non_ascii_literal, similar_names, unicode_not_nfc, enum_glob_use, if_not_else, items_after_statements, used_underscore_binding))] - -//! FIXME: Docs - #![allow(unknown_lints)] #![deny(bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership, non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, @@ -21,14 +18,18 @@ // #![feature(conservative_impl_trait)] +//! FIXME: Docs + #[macro_use] extern crate derive_builder; #[macro_use] extern crate diesel; #[macro_use] extern crate diesel_migrations; +// #[macro_use] +extern crate failure; #[macro_use] -extern crate error_chain; +extern crate failure_derive; #[macro_use] extern crate lazy_static; #[macro_use] @@ -44,7 +45,6 @@ extern crate itertools; extern crate native_tls; extern crate num_cpus; extern crate rayon; -extern crate reqwest; extern crate rfc822_sanitizer; extern crate rss; extern crate tokio_core; diff --git a/hammond-data/src/models/episode.rs b/hammond-data/src/models/episode.rs index 948422c..65dafaa 100644 --- a/hammond-data/src/models/episode.rs +++ b/hammond-data/src/models/episode.rs @@ -4,7 +4,7 @@ use diesel::SaveChangesDsl; use diesel::prelude::*; use database::connection; -use errors::*; +use errors::DataError; use models::{Podcast, Save}; use schema::episode; @@ -31,9 +31,9 @@ pub struct Episode { podcast_id: i32, } -impl Save for Episode { +impl Save for Episode { /// Helper method to easily save/"sync" current state of self to the Database. - fn save(&self) -> Result { + fn save(&self) -> Result { let db = connection(); let tempdb = db.get()?; @@ -180,7 +180,7 @@ impl Episode { } /// Sets the `played` value with the current `epoch` timestap and save it. - pub fn set_played_now(&mut self) -> Result<()> { + pub fn set_played_now(&mut self) -> Result<(), DataError> { let epoch = Utc::now().timestamp() as i32; self.set_played(Some(epoch)); self.save().map(|_| ()) @@ -223,9 +223,9 @@ impl From for EpisodeWidgetQuery { } } -impl Save for EpisodeWidgetQuery { +impl Save for EpisodeWidgetQuery { /// Helper method to easily save/"sync" current state of self to the Database. - fn save(&self) -> Result { + fn save(&self) -> Result { use schema::episode::dsl::*; let db = connection(); @@ -342,7 +342,7 @@ impl EpisodeWidgetQuery { } /// Sets the `played` value with the current `epoch` timestap and save it. - pub fn set_played_now(&mut self) -> Result<()> { + pub fn set_played_now(&mut self) -> Result<(), DataError> { let epoch = Utc::now().timestamp() as i32; self.set_played(Some(epoch)); self.save().map(|_| ()) @@ -361,9 +361,9 @@ pub struct EpisodeCleanerQuery { played: Option, } -impl Save for EpisodeCleanerQuery { +impl Save for EpisodeCleanerQuery { /// Helper method to easily save/"sync" current state of self to the Database. - fn save(&self) -> Result { + fn save(&self) -> Result { use schema::episode::dsl::*; let db = connection(); diff --git a/hammond-data/src/models/mod.rs b/hammond-data/src/models/mod.rs index 87efe30..10f19ed 100644 --- a/hammond-data/src/models/mod.rs +++ b/hammond-data/src/models/mod.rs @@ -23,8 +23,6 @@ pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetQuery}; pub use self::podcast::{Podcast, PodcastCoverQuery}; pub use self::source::Source; -use errors::*; - #[derive(Debug, Clone, PartialEq)] pub enum IndexState { Index(T), @@ -32,20 +30,21 @@ pub enum IndexState { NotChanged, } -pub trait Insert { - fn insert(&self) -> Result<()>; +pub trait Insert { + fn insert(&self) -> Result; } -pub trait Update { - fn update(&self, i32) -> Result<()>; +pub trait Update { + fn update(&self, i32) -> Result; } -pub trait Index: Insert + Update { - fn index(&self) -> Result<()>; +// This might need to change in the future +pub trait Index: Insert + Update { + fn index(&self) -> Result; } /// FIXME: DOCS -pub trait Save { +pub trait Save { /// Helper method to easily save/"sync" current state of a diesel model to the Database. - fn save(&self) -> Result; + fn save(&self) -> Result; } diff --git a/hammond-data/src/models/new_episode.rs b/hammond-data/src/models/new_episode.rs index 3de8043..7cc56c7 100644 --- a/hammond-data/src/models/new_episode.rs +++ b/hammond-data/src/models/new_episode.rs @@ -1,17 +1,15 @@ -use diesel::prelude::*; - -use diesel; -use schema::episode; - use ammonia; +use diesel; +use diesel::prelude::*; use rfc822_sanitizer::parse_from_rfc2822_with_fallback as parse_rfc822; use rss; use database::connection; use dbqueries; -use errors::*; +use errors::DataError; use models::{Episode, EpisodeMinimal, Index, Insert, Update}; use parser; +use schema::episode; use utils::{replace_extra_spaces, url_cleaner}; #[derive(Insertable, AsChangeset)] @@ -45,8 +43,8 @@ impl From for NewEpisode { } } -impl Insert for NewEpisode { - fn insert(&self) -> Result<()> { +impl Insert<(), DataError> for NewEpisode { + fn insert(&self) -> Result<(), DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -60,8 +58,8 @@ impl Insert for NewEpisode { } } -impl Update for NewEpisode { - fn update(&self, episode_id: i32) -> Result<()> { +impl Update<(), DataError> for NewEpisode { + fn update(&self, episode_id: i32) -> Result<(), DataError> { use schema::episode::dsl::*; let db = connection(); let con = db.get()?; @@ -75,9 +73,9 @@ impl Update for NewEpisode { } } -impl Index for NewEpisode { +impl Index<(), DataError> for NewEpisode { // Does not update the episode description if it's the only thing that has changed. - fn index(&self) -> Result<()> { + fn index(&self) -> Result<(), DataError> { let exists = dbqueries::episode_exists(self.title(), self.podcast_id())?; if exists { @@ -115,14 +113,14 @@ impl PartialEq for NewEpisode { impl NewEpisode { /// Parses an `rss::Item` into a `NewEpisode` Struct. #[allow(dead_code)] - pub(crate) fn new(item: &rss::Item, podcast_id: i32) -> Result { + pub(crate) fn new(item: &rss::Item, podcast_id: i32) -> Result { NewEpisodeMinimal::new(item, podcast_id).map(|ep| ep.into_new_episode(item)) } #[allow(dead_code)] - pub(crate) fn to_episode(&self) -> Result { + pub(crate) fn to_episode(&self) -> Result { self.index()?; - dbqueries::get_episode_from_pk(&self.title, self.podcast_id) + dbqueries::get_episode_from_pk(&self.title, self.podcast_id).map_err(From::from) } } @@ -184,9 +182,14 @@ impl PartialEq for NewEpisodeMinimal { } impl NewEpisodeMinimal { - pub(crate) fn new(item: &rss::Item, parent_id: i32) -> Result { + pub(crate) fn new(item: &rss::Item, parent_id: i32) -> Result { if item.title().is_none() { - bail!("No title specified for the item.") + let err = DataError::ParseEpisodeError { + reason: format!("No title specified for this Episode."), + parent_id, + }; + + return Err(err); } let title = item.title().unwrap().trim().to_owned(); @@ -197,7 +200,12 @@ impl NewEpisodeMinimal { } else if item.link().is_some() { item.link().map(|s| url_cleaner(s)) } else { - bail!("No url specified for the item.") + let err = DataError::ParseEpisodeError { + reason: format!("No url specified for the item."), + parent_id, + }; + + return Err(err); }; // Default to rfc2822 represantation of epoch 0. diff --git a/hammond-data/src/models/new_podcast.rs b/hammond-data/src/models/new_podcast.rs index f6da37c..c3e9632 100644 --- a/hammond-data/src/models/new_podcast.rs +++ b/hammond-data/src/models/new_podcast.rs @@ -4,6 +4,7 @@ use diesel::prelude::*; use ammonia; use rss; +use errors::DataError; use models::{Index, Insert, Update}; use models::Podcast; use schema::podcast; @@ -12,8 +13,6 @@ use database::connection; use dbqueries; use utils::{replace_extra_spaces, url_cleaner}; -use errors::*; - #[derive(Insertable, AsChangeset)] #[table_name = "podcast"] #[derive(Debug, Clone, Default, Builder, PartialEq)] @@ -28,8 +27,8 @@ pub(crate) struct NewPodcast { source_id: i32, } -impl Insert for NewPodcast { - fn insert(&self) -> Result<()> { +impl Insert<(), DataError> for NewPodcast { + fn insert(&self) -> Result<(), DataError> { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -42,8 +41,8 @@ impl Insert for NewPodcast { } } -impl Update for NewPodcast { - fn update(&self, podcast_id: i32) -> Result<()> { +impl Update<(), DataError> for NewPodcast { + fn update(&self, podcast_id: i32) -> Result<(), DataError> { use schema::podcast::dsl::*; let db = connection(); let con = db.get()?; @@ -59,8 +58,8 @@ impl Update for NewPodcast { // TODO: Maybe return an Enum Instead. // It would make unti testing better too. -impl Index for NewPodcast { - fn index(&self) -> Result<()> { +impl Index<(), DataError> for NewPodcast { + fn index(&self) -> Result<(), DataError> { let exists = dbqueries::podcast_exists(self.source_id)?; if exists { @@ -119,7 +118,7 @@ impl NewPodcast { } // Look out for when tryinto lands into stable. - pub(crate) fn to_podcast(&self) -> Result { + pub(crate) fn to_podcast(&self) -> Result { self.index()?; dbqueries::get_podcast_from_source_id(self.source_id).map_err(From::from) } diff --git a/hammond-data/src/models/new_source.rs b/hammond-data/src/models/new_source.rs index 944e7c1..881b008 100644 --- a/hammond-data/src/models/new_source.rs +++ b/hammond-data/src/models/new_source.rs @@ -7,11 +7,10 @@ use url::Url; use database::connection; use dbqueries; // use models::{Insert, Update}; +use errors::DataError; use models::Source; use schema::source; -use errors::*; - #[derive(Insertable)] #[table_name = "source"] #[derive(Debug, Clone, Default, Builder, PartialEq)] @@ -33,7 +32,7 @@ impl NewSource { } } - pub(crate) fn insert_or_ignore(&self) -> Result<()> { + pub(crate) fn insert_or_ignore(&self) -> Result<(), DataError> { use schema::source::dsl::*; let db = connection(); let con = db.get()?; @@ -46,8 +45,8 @@ impl NewSource { } // Look out for when tryinto lands into stable. - pub(crate) fn to_source(&self) -> Result { + pub(crate) fn to_source(&self) -> Result { self.insert_or_ignore()?; - dbqueries::get_source_from_uri(&self.uri) + dbqueries::get_source_from_uri(&self.uri).map_err(From::from) } } diff --git a/hammond-data/src/models/podcast.rs b/hammond-data/src/models/podcast.rs index fb6ab74..a5ac44b 100644 --- a/hammond-data/src/models/podcast.rs +++ b/hammond-data/src/models/podcast.rs @@ -1,7 +1,7 @@ use diesel::SaveChangesDsl; use database::connection; -use errors::*; +use errors::DataError; use models::{Save, Source}; use schema::podcast; @@ -23,9 +23,9 @@ pub struct Podcast { source_id: i32, } -impl Save for Podcast { +impl Save for Podcast { /// Helper method to easily save/"sync" current state of self to the Database. - fn save(&self) -> Result { + fn save(&self) -> Result { let db = connection(); let tempdb = db.get()?; diff --git a/hammond-data/src/models/source.rs b/hammond-data/src/models/source.rs index aa08ad9..4a52dc0 100644 --- a/hammond-data/src/models/source.rs +++ b/hammond-data/src/models/source.rs @@ -1,4 +1,5 @@ use diesel::SaveChangesDsl; +// use failure::ResultExt; use rss::Channel; use url::Url; @@ -13,7 +14,7 @@ use futures::prelude::*; use futures_cpupool::CpuPool; use database::connection; -use errors::*; +use errors::DataError; use feed::{Feed, FeedBuilder}; use models::{NewSource, Save}; use schema::source; @@ -32,9 +33,9 @@ pub struct Source { http_etag: Option, } -impl Save for Source { +impl Save for Source { /// Helper method to easily save/"sync" current state of self to the Database. - fn save(&self) -> Result { + fn save(&self) -> Result { let db = connection(); let con = db.get()?; @@ -85,7 +86,7 @@ impl Source { /// Extract Etag and LastModifier from res, and update self and the /// corresponding db row. - fn update_etag(&mut self, res: &Response) -> Result<()> { + fn update_etag(&mut self, res: &Response) -> Result<(), DataError> { let headers = res.headers(); let etag = headers.get::().map(|x| x.tag()); @@ -109,29 +110,77 @@ impl Source { // 403: Forbidden // 408: Timeout // 410: Feed deleted - fn match_status(mut self, res: Response) -> Result<(Self, Response)> { + // TODO: Rething this api, + fn match_status(mut self, res: Response) -> Result<(Self, Response), DataError> { self.update_etag(&res)?; let code = res.status(); match code { - StatusCode::NotModified => bail!("304: skipping.."), + StatusCode::NotModified => { + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("304: skipping.."), + }; + + return Err(err); + } StatusCode::MovedPermanently => { error!("Feed was moved permanently."); self.handle_301(&res)?; - bail!("301: Feed was moved permanently.") + + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("301: Feed was moved permanently."), + }; + + return Err(err); } StatusCode::TemporaryRedirect => debug!("307: Temporary Redirect."), StatusCode::PermanentRedirect => warn!("308: Permanent Redirect."), - StatusCode::Unauthorized => bail!("401: Unauthorized."), - StatusCode::Forbidden => bail!("403: Forbidden."), - StatusCode::NotFound => bail!("404: Not found."), - StatusCode::RequestTimeout => bail!("408: Request Timeout."), - StatusCode::Gone => bail!("410: Feed was deleted."), + StatusCode::Unauthorized => { + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("401: Unauthorized."), + }; + + return Err(err); + } + StatusCode::Forbidden => { + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("403: Forbidden."), + }; + + return Err(err); + } + StatusCode::NotFound => return Err(format!("404: Not found.")).map_err(From::from), + StatusCode::RequestTimeout => { + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("408: Request Timeout."), + }; + + return Err(err); + } + StatusCode::Gone => { + let err = DataError::HttpStatusError { + url: self.uri, + status_code: code, + context: format!("410: Feed was deleted.."), + }; + + return Err(err); + } _ => info!("HTTP StatusCode: {}", code), }; Ok((self, res)) } - fn handle_301(&mut self, res: &Response) -> Result<()> { + fn handle_301(&mut self, res: &Response) -> Result<(), DataError> { let headers = res.headers(); if let Some(url) = headers.get::() { @@ -150,7 +199,7 @@ impl Source { /// Construct a new `Source` with the given `uri` and index it. /// /// This only indexes the `Source` struct, not the Podcast Feed. - pub fn from_url(uri: &str) -> Result { + pub fn from_url(uri: &str) -> Result { let url = Url::parse(uri)?; NewSource::new(&url).to_source() @@ -169,7 +218,7 @@ impl Source { client: &Client>, pool: CpuPool, ignore_etags: bool, - ) -> Box> { + ) -> Box> { let id = self.id(); let feed = self.request_constructor(client, ignore_etags) .and_then(move |(_, res)| response_to_channel(res, pool)) @@ -190,7 +239,7 @@ impl Source { self, client: &Client>, ignore_etags: bool, - ) -> Box> { + ) -> Box> { // FIXME: remove unwrap somehow let uri = Uri::from_str(self.uri()).unwrap(); let mut req = Request::new(Method::Get, uri); @@ -221,14 +270,16 @@ impl Source { fn response_to_channel( res: Response, pool: CpuPool, -) -> Box + Send> { +) -> Box + Send> { let chan = res.body() .concat2() .map(|x| x.into_iter()) .map_err(From::from) .map(|iter| iter.collect::>()) .map(|utf_8_bytes| String::from_utf8_lossy(&utf_8_bytes).into_owned()) - .and_then(|buf| Channel::from_str(&buf).map_err(From::from)); + .and_then(|buf| { + Channel::from_str(&buf).or_else(|err| Err(DataError::RssCrateError(format!("{}", err)))) + }); let cpu_chan = pool.spawn(chan); Box::new(cpu_chan) } diff --git a/hammond-data/src/pipeline.rs b/hammond-data/src/pipeline.rs index 418ecdf..893bc23 100644 --- a/hammond-data/src/pipeline.rs +++ b/hammond-data/src/pipeline.rs @@ -15,11 +15,9 @@ use rss; use Source; use dbqueries; -use errors::*; +use errors::DataError; use models::{IndexState, NewEpisode, NewEpisodeMinimal}; -// use Feed; -use std; // use std::sync::{Arc, Mutex}; macro_rules! clone { @@ -51,7 +49,7 @@ pub fn pipeline>( tokio_core: &mut Core, pool: &CpuPool, client: Client>, -) -> Result<()> { +) -> Result<(), DataError> { let list: Vec<_> = sources .into_iter() .map(clone!(pool => move |s| s.into_feed(&client, pool.clone(), ignore_etags))) @@ -60,7 +58,7 @@ pub fn pipeline>( .collect(); if list.is_empty() { - bail!("No futures were found to run."); + return Err(DataError::EmptyFuturesList); } // Thats not really concurrent yet I think. @@ -70,7 +68,7 @@ pub fn pipeline>( } /// Creates a tokio `reactor::Core`, a `CpuPool`, and a `hyper::Client` and runs the pipeline. -pub fn run(sources: Vec, ignore_etags: bool) -> Result<()> { +pub fn run(sources: Vec, ignore_etags: bool) -> Result<(), DataError> { if sources.is_empty() { return Ok(()); } @@ -86,7 +84,7 @@ pub fn run(sources: Vec, ignore_etags: bool) -> Result<()> { } /// Docs -pub fn index_single_source(s: Source, ignore_etags: bool) -> Result<()> { +pub fn index_single_source(s: Source, ignore_etags: bool) -> Result<(), DataError> { let pool = CpuPool::new_num_cpus(); let mut core = Core::new()?; let handle = core.handle(); @@ -102,7 +100,10 @@ pub fn index_single_source(s: Source, ignore_etags: bool) -> Result<()> { core.run(work) } -fn determine_ep_state(ep: NewEpisodeMinimal, item: &rss::Item) -> Result> { +fn determine_ep_state( + ep: NewEpisodeMinimal, + item: &rss::Item, +) -> Result, DataError> { // Check if feed exists let exists = dbqueries::episode_exists(ep.title(), ep.podcast_id())?; @@ -123,7 +124,7 @@ fn determine_ep_state(ep: NewEpisodeMinimal, item: &rss::Item) -> Result( item: &'a rss::Item, id: i32, -) -> Box, Error = Error> + 'a> { +) -> Box, Error = DataError> + 'a> { Box::new( result(NewEpisodeMinimal::new(item, id)).and_then(move |ep| determine_ep_state(ep, item)), ) @@ -135,7 +136,7 @@ pub(crate) fn glue_async<'a>( #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] pub fn collect_futures( futures: Vec, -) -> Box>, Error = Error>> +) -> Box>, Error = DataError>> where F: 'static + Future, ::Item: 'static, diff --git a/hammond-data/src/utils.rs b/hammond-data/src/utils.rs index 97f762b..5681686 100644 --- a/hammond-data/src/utils.rs +++ b/hammond-data/src/utils.rs @@ -7,7 +7,7 @@ use itertools::Itertools; use url::{Position, Url}; use dbqueries; -use errors::*; +use errors::DataError; use models::{EpisodeCleanerQuery, Podcast, Save}; use xdg_dirs::DL_DIR; @@ -15,7 +15,7 @@ use std::fs; use std::path::Path; /// Scan downloaded `episode` entries that might have broken `local_uri`s and set them to `None`. -fn download_checker() -> Result<()> { +fn download_checker() -> Result<(), DataError> { let mut episodes = dbqueries::get_downloaded_episodes()?; episodes @@ -25,7 +25,7 @@ fn download_checker() -> Result<()> { ep.set_local_uri(None); if let Err(err) = ep.save() { error!("Error while trying to update episode: {:#?}", ep); - error!("Error: {}", err); + error!("{}", err); }; }); @@ -33,7 +33,7 @@ fn download_checker() -> Result<()> { } /// Delete watched `episodes` that have exceded their liftime after played. -fn played_cleaner() -> Result<()> { +fn played_cleaner() -> Result<(), DataError> { let mut episodes = dbqueries::get_played_cleaner_episodes()?; let now_utc = Utc::now().timestamp() as i32; @@ -47,7 +47,7 @@ fn played_cleaner() -> Result<()> { if now_utc > limit { if let Err(err) = delete_local_content(ep) { error!("Error while trying to delete file: {:?}", ep.local_uri()); - error!("Error: {}", err); + error!("{}", err); } else { info!("Episode {:?} was deleted succesfully.", ep.local_uri()); }; @@ -57,7 +57,7 @@ fn played_cleaner() -> Result<()> { } /// Check `ep.local_uri` field and delete the file it points to. -fn delete_local_content(ep: &mut EpisodeCleanerQuery) -> Result<()> { +fn delete_local_content(ep: &mut EpisodeCleanerQuery) -> Result<(), DataError> { if ep.local_uri().is_some() { let uri = ep.local_uri().unwrap().to_owned(); if Path::new(&uri).exists() { @@ -67,7 +67,7 @@ fn delete_local_content(ep: &mut EpisodeCleanerQuery) -> Result<()> { ep.save()?; } else { error!("Error while trying to delete file: {}", uri); - error!("Error: {}", res.unwrap_err()); + error!("{}", res.unwrap_err()); }; } } else { @@ -86,7 +86,7 @@ fn delete_local_content(ep: &mut EpisodeCleanerQuery) -> Result<()> { /// /// Runs a cleaner for played Episode's that are pass the lifetime limit and /// scheduled for removal. -pub fn checkup() -> Result<()> { +pub fn checkup() -> Result<(), DataError> { info!("Running database checks."); download_checker()?; played_cleaner()?; @@ -123,7 +123,7 @@ pub fn replace_extra_spaces(s: &str) -> String { } /// Returns the URI of a Podcast Downloads given it's title. -pub fn get_download_folder(pd_title: &str) -> Result { +pub fn get_download_folder(pd_title: &str) -> Result { // It might be better to make it a hash of the title or the podcast rowid let download_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title); @@ -137,7 +137,7 @@ pub fn get_download_folder(pd_title: &str) -> Result { /// Removes all the entries associated with the given show from the database, /// and deletes all of the downloaded content. // TODO: Write Tests -pub fn delete_show(pd: &Podcast) -> Result<()> { +pub fn delete_show(pd: &Podcast) -> Result<(), DataError> { dbqueries::remove_feed(pd)?; info!("{} was removed succesfully.", pd.title()); diff --git a/hammond-downloader/Cargo.toml b/hammond-downloader/Cargo.toml index 29a2b34..48fc70e 100644 --- a/hammond-downloader/Cargo.toml +++ b/hammond-downloader/Cargo.toml @@ -12,6 +12,8 @@ mime_guess = "1.8.3" reqwest = "0.8.4" tempdir = "0.3.5" glob = "0.2.11" +failure = "0.1.1" +failure_derive = "0.1.1" [dependencies.hammond-data] path = "../hammond-data" diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index b54573d..53851aa 100644 --- a/hammond-downloader/src/downloader.rs +++ b/hammond-downloader/src/downloader.rs @@ -11,10 +11,12 @@ use std::io::{BufWriter, Read, Write}; use std::path::Path; use std::sync::{Arc, Mutex}; -use errors::*; use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save}; use hammond_data::xdg_dirs::HAMMOND_CACHE; +// use failure::Error; +use errors::DownloadError; + // TODO: Replace path that are of type &str with std::path. // TODO: Have a convention/document absolute/relative paths, if they should end with / or not. @@ -36,7 +38,7 @@ fn download_into( file_title: &str, url: &str, progress: Option>>, -) -> Result { +) -> Result { info!("GET request to: {}", url); // Haven't included the loop check as // Steal the Stars would tigger it as @@ -60,7 +62,7 @@ fn download_into( info!("Status Resp: {}", resp.status()); if !resp.status().is_success() { - bail!("Unexpected server response: {}", resp.status()) + return Err(DownloadError::UnexpectedResponse(resp.status())); } let headers = resp.headers().clone(); @@ -117,7 +119,7 @@ fn save_io( resp: &mut reqwest::Response, content_lenght: Option, progress: Option>>, -) -> Result<()> { +) -> Result<(), DownloadError> { info!("Downloading into: {}", file); let chunk_size = match content_lenght { Some(x) => x as usize / 99, @@ -139,7 +141,7 @@ fn save_io( if let Ok(l) = len { if let Ok(mut m) = prog.lock() { if m.should_cancel() { - bail!("Download was cancelled."); + return Err(DownloadError::DownloadCancelled); } m.set_downloaded(l); } @@ -158,7 +160,7 @@ pub fn get_episode( ep: &mut EpisodeWidgetQuery, download_folder: &str, progress: Option>>, -) -> Result<()> { +) -> Result<(), DownloadError> { // Check if its alrdy downloaded if ep.local_uri().is_some() { if Path::new(ep.local_uri().unwrap()).exists() { diff --git a/hammond-downloader/src/errors.rs b/hammond-downloader/src/errors.rs index a87f2ca..7df3bd1 100644 --- a/hammond-downloader/src/errors.rs +++ b/hammond-downloader/src/errors.rs @@ -1,11 +1,35 @@ -use hammond_data; +use hammond_data::errors::DataError; use reqwest; use std::io; -error_chain! { - foreign_links { - ReqError(reqwest::Error); - IoError(io::Error); - DataError(hammond_data::errors::Error); +#[derive(Fail, Debug)] +pub enum DownloadError { + #[fail(display = "Reqwest error: {}", _0)] + RequestError(#[cause] reqwest::Error), + #[fail(display = "Data error: {}", _0)] + DataError(#[cause] DataError), + #[fail(display = "Io error: {}", _0)] + IoError(#[cause] io::Error), + #[fail(display = "The Download was cancelled")] + DownloadCancelled, + #[fail(display = "Unexpected server response: {}", _0)] + UnexpectedResponse(reqwest::StatusCode), +} + +impl From for DownloadError { + fn from(err: reqwest::Error) -> Self { + DownloadError::RequestError(err) + } +} + +impl From for DownloadError { + fn from(err: io::Error) -> Self { + DownloadError::IoError(err) + } +} + +impl From for DownloadError { + fn from(err: DataError) -> Self { + DownloadError::DataError(err) } } diff --git a/hammond-downloader/src/lib.rs b/hammond-downloader/src/lib.rs index 82be1f6..64276d3 100644 --- a/hammond-downloader/src/lib.rs +++ b/hammond-downloader/src/lib.rs @@ -1,13 +1,15 @@ #![recursion_limit = "1024"] #![deny(unused_extern_crates, unused)] +extern crate failure; #[macro_use] -extern crate error_chain; +extern crate failure_derive; +#[macro_use] +extern crate log; + extern crate glob; extern crate hammond_data; extern crate hyper; -#[macro_use] -extern crate log; extern crate mime_guess; extern crate reqwest; extern crate tempdir; diff --git a/hammond-gtk/Cargo.toml b/hammond-gtk/Cargo.toml index e1c8c49..d8b2ab2 100644 --- a/hammond-gtk/Cargo.toml +++ b/hammond-gtk/Cargo.toml @@ -20,6 +20,8 @@ open = "1.2.1" rayon = "0.9.0" send-cell = "0.1.2" url = "1.6.0" +failure = "0.1.1" +failure_derive = "0.1.1" [dependencies.gtk] features = ["v3_22"] diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index b36e2ef..e241db8 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -1,5 +1,5 @@ #![cfg_attr(feature = "cargo-clippy", allow(clone_on_ref_ptr, needless_pass_by_value))] -#![deny(unused_extern_crates, unused)] +// #![deny(unused_extern_crates, unused)] extern crate gdk; extern crate gdk_pixbuf; @@ -7,15 +7,20 @@ extern crate gio; extern crate glib; extern crate gtk; +#[macro_use] +extern crate failure; +#[macro_use] +extern crate failure_derive; +#[macro_use] +extern crate lazy_static; +#[macro_use] +extern crate log; + extern crate chrono; extern crate dissolve; extern crate hammond_data; extern crate hammond_downloader; extern crate humansize; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate log; extern crate loggerv; extern crate open; extern crate send_cell; diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 0490b8d..2886176 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -4,12 +4,12 @@ use gtk; use chrono::prelude::*; use gtk::prelude::*; +use failure::Error; use humansize::{file_size_opts as size_opts, FileSize}; use open; use hammond_data::{EpisodeWidgetQuery, Podcast}; use hammond_data::dbqueries; -use hammond_data::errors::*; use hammond_data::utils::get_download_folder; use app::Action; @@ -368,7 +368,7 @@ fn update_total_size_callback(prog: Arc>, total_size: g // }; // } -pub fn episodes_listbox(pd: &Podcast, sender: Sender) -> Result { +pub fn episodes_listbox(pd: &Podcast, sender: Sender) -> Result { let mut episodes = dbqueries::get_pd_episodeswidgets(pd)?; let list = gtk::ListBox::new();