From 11ff053b9db6caaa7093050e5336da51414beae3 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sat, 1 Jul 2017 12:03:15 -0700
Subject: [PATCH] Moved index out of db module

---
 src/db/mod.rs         | 6 +++---
 src/{db => }/index.rs | 2 +-
 src/main.rs           | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{db => }/index.rs (99%)

diff --git a/src/db/mod.rs b/src/db/mod.rs
index a2300c7..2be224b 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -14,10 +14,10 @@ use errors::*;
 use user::*;
 use vfs::{MountPoint, Vfs};
 
-mod index;
 mod schema;
 
-use self::index::{CollectionFile, Directory, Song};
+use index;
+use index::{CollectionFile, Directory, Song};
 pub use self::schema::*;
 
 #[allow(dead_code)]
@@ -127,7 +127,7 @@ impl DB {
 		index::update_loop(self);
 	}
 
-	fn get_vfs(&self) -> Result<Vfs> {
+	pub fn get_vfs(&self) -> Result<Vfs> {
 		use self::mount_points::dsl::*;
 		let mut vfs = Vfs::new();
 		let connection = self.connection.lock().unwrap();
diff --git a/src/db/index.rs b/src/index.rs
similarity index 99%
rename from src/db/index.rs
rename to src/index.rs
index a1cd0fa..64898ff 100644
--- a/src/db/index.rs
+++ b/src/index.rs
@@ -11,7 +11,7 @@ use std::time;
 
 use config::{MiscSettings, UserConfig};
 use db::DB;
-use db::schema::*;
+use db::{directories, misc_settings, songs};
 use errors::*;
 use metadata;
 
diff --git a/src/main.rs b/src/main.rs
index 145a2a1..f44f989 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -63,6 +63,7 @@ mod config;
 mod db;
 mod ddns;
 mod errors;
+mod index;
 mod metadata;
 mod ui;
 mod user;