diff --git a/src/config.rs b/src/config.rs index 32f0fad..f960b6c 100644 --- a/src/config.rs +++ b/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, diff --git a/src/db/index.rs b/src/db/index.rs index c5d2f77..a1cd0fa 100644 --- a/src/db/index.rs +++ b/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; diff --git a/src/db/mod.rs b/src/db/mod.rs index 50d5eff..a2300c7 100644 --- a/src/db/mod.rs +++ b/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"; diff --git a/src/db/models.rs b/src/db/models.rs deleted file mode 100644 index fb61bc5..0000000 --- a/src/db/models.rs +++ /dev/null @@ -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, -}