From d70abba47e34f94fc7c6ef338c3d3531111cac20 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sat, 1 Jul 2017 11:40:31 -0700
Subject: [PATCH] Moved MountPoint structure into vfs module

---
 src/config.rs    |  2 +-
 src/db/mod.rs    |  4 ++--
 src/db/models.rs | 10 ----------
 src/vfs.rs       |  7 +++++++
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 6241471..32f0fad 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -5,7 +5,7 @@ use std::path;
 use toml;
 
 use errors::*;
-use db::MountPoint;
+use vfs::MountPoint;
 use ddns::DDNSConfig;
 
 #[derive(Deserialize)]
diff --git a/src/db/mod.rs b/src/db/mod.rs
index 23ba6dd..71b4f40 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -9,15 +9,15 @@ use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
 use config::UserConfig;
-use db::schema::*;
 use ddns::{DDNSConfigSource, DDNSConfig};
 use errors::*;
-use vfs::Vfs;
+use vfs::{MountPoint, Vfs};
 
 mod index;
 mod models;
 mod schema;
 
+pub use self::schema::*;
 pub use self::models::*;
 
 #[allow(dead_code)]
diff --git a/src/db/models.rs b/src/db/models.rs
index b3afe57..73956a9 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -97,16 +97,6 @@ impl NewUser {
 	}
 }
 
-
-// VFS
-#[derive(Debug, Deserialize, Insertable, Queryable)]
-#[table_name="mount_points"]
-pub struct MountPoint {
-	pub source: String,
-	pub name: String,
-}
-
-
 // Misc Settings
 #[derive(Debug, Queryable)]
 pub struct MiscSettings {
diff --git a/src/vfs.rs b/src/vfs.rs
index 70b7dc4..f223a7f 100644
--- a/src/vfs.rs
+++ b/src/vfs.rs
@@ -2,8 +2,15 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use std::path::Path;
 
+use db::mount_points;
 use errors::*;
 
+#[derive(Debug, Deserialize, Insertable, Queryable)]
+#[table_name="mount_points"]
+pub struct MountPoint {
+	pub source: String,
+	pub name: String,
+}
 
 pub struct Vfs {
 	mount_points: HashMap<String, PathBuf>,