From 2dace6b3d4e951009260bf753bdf9d07ee56c583 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sat, 8 Jul 2017 16:36:59 -0700
Subject: [PATCH] Fixed a bug where default database location was incorrect

---
 src/main.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8f0fce6..72acde2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -112,9 +112,13 @@ fn run() -> Result<()> {
 
 	// Init DB
 	println!("Starting up database");
-	let db_file_name = matches.opt_str("d").unwrap_or("db.sqlite".to_owned());
-	let db_file_path = Path::new(&db_file_name);
-	let db = Arc::new(db::DB::new(&db_file_path)?);
+	let db_path = matches.opt_str("d");
+	let mut default_db_path = utils::get_data_root()?;
+	default_db_path.push("db.sqlite");
+	let db_path = db_path
+		.map(|n| Path::new(n.as_str()).to_path_buf())
+		.unwrap_or(default_db_path);
+	let db = Arc::new(db::DB::new(&db_path)?);
 
 	// Parse config
 	let config_file_name = matches.opt_str("c");