From 1ec4370c7bcbf847d2c8e63d602dc116caa67886 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 17 Nov 2017 21:37:55 +0200 Subject: [PATCH] Moved Database type-alias into hammond-data/src/lib.rs. --- hammond-data/src/dbqueries.rs | 2 +- hammond-data/src/index_feed.rs | 6 +++--- hammond-data/src/lib.rs | 4 ++++ hammond-data/src/models/insertables.rs | 3 +-- hammond-data/src/models/queryables.rs | 3 ++- hammond-data/src/utils.rs | 2 +- hammond-downloader/src/downloader.rs | 2 +- hammond-gtk/src/headerbar.rs | 2 +- hammond-gtk/src/utils.rs | 2 +- hammond-gtk/src/views/podcasts_view.rs | 2 +- hammond-gtk/src/widgets/episode.rs | 2 +- hammond-gtk/src/widgets/podcast.rs | 2 +- 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hammond-data/src/dbqueries.rs b/hammond-data/src/dbqueries.rs index 3f53094..075b7c8 100644 --- a/hammond-data/src/dbqueries.rs +++ b/hammond-data/src/dbqueries.rs @@ -2,7 +2,7 @@ use diesel::prelude::*; use diesel; use models::{Episode, Podcast, Source}; -use index_feed::Database; +use Database; use chrono::prelude::*; /// Random db querries helper functions. diff --git a/hammond-data/src/index_feed.rs b/hammond-data/src/index_feed.rs index 949ff5b..203ff0c 100644 --- a/hammond-data/src/index_feed.rs +++ b/hammond-data/src/index_feed.rs @@ -1,17 +1,16 @@ -use diesel::prelude::*; use rayon::prelude::*; use rss; use dbqueries; use feedparser; +use Database; use models::*; use errors::*; -use std::sync::{Arc, Mutex}; +use std::sync::Arc; -pub type Database = Arc>; #[derive(Debug)] pub struct Feed { @@ -124,6 +123,7 @@ mod tests { use std::io::BufReader; use std::path::PathBuf; use std::fs; + use std::sync::Mutex; use super::*; diff --git a/hammond-data/src/lib.rs b/hammond-data/src/lib.rs index f36a836..5b2799a 100644 --- a/hammond-data/src/lib.rs +++ b/hammond-data/src/lib.rs @@ -32,7 +32,11 @@ mod schema; use diesel::migrations::RunMigrationsError; use diesel::prelude::*; + use std::path::PathBuf; +use std::sync::{Arc, Mutex}; + +pub type Database = Arc>; embed_migrations!("migrations/"); diff --git a/hammond-data/src/models/insertables.rs b/hammond-data/src/models/insertables.rs index e292930..1dde56f 100644 --- a/hammond-data/src/models/insertables.rs +++ b/hammond-data/src/models/insertables.rs @@ -3,10 +3,9 @@ use diesel; use schema::{episode, podcast, source}; use models::{Podcast, Source}; -use index_feed::Database; +use Database; use errors::*; -// use index_feed; use dbqueries; #[derive(Insertable)] diff --git a/hammond-data/src/models/queryables.rs b/hammond-data/src/models/queryables.rs index 3b6de35..da2f787 100644 --- a/hammond-data/src/models/queryables.rs +++ b/hammond-data/src/models/queryables.rs @@ -6,10 +6,11 @@ use reqwest::header::{ETag, LastModified}; use rss::Channel; use schema::{episode, podcast, source}; -use index_feed::{Database, Feed}; +use index_feed::Feed; use errors::*; use models::insertables::NewPodcast; +use Database; use std::io::Read; use std::str::FromStr; diff --git a/hammond-data/src/utils.rs b/hammond-data/src/utils.rs index 3e1a9bb..bf81cbd 100644 --- a/hammond-data/src/utils.rs +++ b/hammond-data/src/utils.rs @@ -2,7 +2,7 @@ use rayon::prelude::*; use errors::*; use dbqueries; -use index_feed::Database; +use Database; use models::Episode; use chrono::prelude::*; diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index 1b25d65..49037c8 100644 --- a/hammond-downloader/src/downloader.rs +++ b/hammond-downloader/src/downloader.rs @@ -10,7 +10,7 @@ use std::io::{BufWriter, Read, Write}; use std::path::Path; use errors::*; -use hammond_data::index_feed::Database; +use hammond_data::Database; use hammond_data::models::{Episode, Podcast}; use hammond_data::{DL_DIR, HAMMOND_CACHE}; diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 70d3604..9686d66 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -2,7 +2,7 @@ use gtk; use gtk::prelude::*; use hammond_data::models::NewSource; -use hammond_data::index_feed::Database; +use hammond_data::Database; use podcasts_view::update_podcasts_view; use utils; diff --git a/hammond-gtk/src/utils.rs b/hammond-gtk/src/utils.rs index 0bff632..2a16fc0 100644 --- a/hammond-gtk/src/utils.rs +++ b/hammond-gtk/src/utils.rs @@ -3,7 +3,7 @@ use gtk; use hammond_data::index_feed; use hammond_data::models::Source; -use hammond_data::index_feed::Database; +use hammond_data::Database; use std::{thread, time}; use std::cell::RefCell; diff --git a/hammond-gtk/src/views/podcasts_view.rs b/hammond-gtk/src/views/podcasts_view.rs index aabeb79..5f73684 100644 --- a/hammond-gtk/src/views/podcasts_view.rs +++ b/hammond-gtk/src/views/podcasts_view.rs @@ -4,7 +4,7 @@ use gdk_pixbuf::Pixbuf; use hammond_data::dbqueries; use hammond_data::models::Podcast; -use hammond_data::index_feed::Database; +use hammond_data::Database; use widgets::podcast::*; diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index e7c9662..b0faf40 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -3,7 +3,7 @@ use open; use hammond_data::dbqueries; use hammond_data::models::{Episode, Podcast}; use hammond_downloader::downloader; -use hammond_data::index_feed::Database; +use hammond_data::Database; use hammond_data::utils::*; use hammond_data::errors::*; diff --git a/hammond-gtk/src/widgets/podcast.rs b/hammond-gtk/src/widgets/podcast.rs index 0d07609..f7a4047 100644 --- a/hammond-gtk/src/widgets/podcast.rs +++ b/hammond-gtk/src/widgets/podcast.rs @@ -6,7 +6,7 @@ use std::fs; use hammond_data::dbqueries; use hammond_data::models::Podcast; -use hammond_data::index_feed::Database; +use hammond_data::Database; use hammond_downloader::downloader; use widgets::episode::episodes_listbox;