Moved Database type-alias into hammond-data/src/lib.rs.

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.

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<Mutex<SqliteConnection>>;
 
 #[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::*;
 

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<Mutex<SqliteConnection>>;
 
 embed_migrations!("migrations/");
 

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)]

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;

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::*;
 

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};
 

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;

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;

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::*;
 

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::*;
 

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;