Removed models module

src/config.rs

@@ -8,6 +8,14 @@ use errors::*;
 use vfs::MountPoint;
 use ddns::DDNSConfig;
 
+#[derive(Debug, Queryable)]
+pub struct MiscSettings {
+	id: i32,
+	pub auth_secret: String,
+	pub index_sleep_duration_seconds: i32,
+	pub index_album_art_pattern: String,
+}
+
 #[derive(Deserialize)]
 pub struct User {
 	pub name: String,

src/db/index.rs

@@ -9,9 +9,8 @@ use std::sync::Mutex;
 use std::thread;
 use std::time;
 
-use config::UserConfig;
+use config::{MiscSettings, UserConfig};
 use db::DB;
-use db::models::MiscSettings;
 use db::schema::*;
 use errors::*;
 use metadata;

src/db/mod.rs

@@ -8,19 +8,17 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
-use config::UserConfig;
+use config::{MiscSettings, UserConfig};
 use ddns::{DDNSConfigSource, DDNSConfig};
 use errors::*;
 use user::*;
 use vfs::{MountPoint, Vfs};
 
 mod index;
-mod models;
 mod schema;
 
 use self::index::{CollectionFile, Directory, Song};
 pub use self::schema::*;
-pub use self::models::*;
 
 #[allow(dead_code)]
 const DB_MIGRATIONS_PATH: &'static str = "src/db/migrations";

src/db/models.rs

@@ -1,8 +0,0 @@
-// Misc Settings
-#[derive(Debug, Queryable)]
-pub struct MiscSettings {
-	id: i32,
-	pub auth_secret: String,
-	pub index_sleep_duration_seconds: i32,
-	pub index_album_art_pattern: String,
-}