morpheus

commit d0ec68ce89c697832703a6c65273b79206bf6778
parent 710a7a9c008e628170372ce4c5eab910deff8b4d
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed, 23 Aug 2017 23:03:55 +0200

Save log and database to the correct systems config folders.

Diffstat:
M
matrix/db.go
 | 
9
++++++---
M
util/logger.go
 | 
10
+++++++---

2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/matrix/db.go b/matrix/db.go
@@ -3,7 +3,9 @@ package matrix
 import (
 	"log"
 	"os"
+	"path/filepath"
 
+	"github.com/shibukawa/configdir"
 	"github.com/tidwall/buntdb"
 )
 
@@ -11,10 +13,11 @@ var db *buntdb.DB
 
 func OpenDB() (expDB *buntdb.DB) {
 	// Open the data.db file. It will be created if it doesn't exist.
-	if _, err := os.Stat("./data/"); os.IsNotExist(err) {
-		os.Mkdir("./data/", 0666)
+	configDirs := configdir.New("Nordgedanken", "Neo")
+	if _, err := os.Stat(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path) + "/data/"); os.IsNotExist(err) {
+		os.MkdirAll(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path)+"/data/", 0666)
 	}
-	expDB, err := buntdb.Open("./data/data.db")
+	expDB, err := buntdb.Open(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path) + "/data/data.db")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/util/logger.go b/util/logger.go
@@ -4,8 +4,11 @@ import (
 	"io"
 	"log"
 	"os"
+	"path/filepath"
 	"sync"
 	"time"
+
+	"github.com/shibukawa/configdir"
 )
 
 var logInstance *log.Logger
@@ -21,10 +24,11 @@ func Logger() *log.Logger {
 
 //StartFileLog initialises the logging function
 func StartFileLog(localLog *log.Logger) (*log.Logger, *os.File) {
-	if _, err := os.Stat("./log/"); os.IsNotExist(err) {
-		os.Mkdir("./log/", 0666)
+	configDirs := configdir.New("Nordgedanken", "Neo")
+	if _, err := os.Stat(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path) + "/log/"); os.IsNotExist(err) {
+		os.MkdirAll(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path)+"/log/", 0666)
 	}
-	f, err := os.OpenFile("./log/Main.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
+	f, err := os.OpenFile(filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path)+"/log/Neo.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
 	if err != nil {
 		localLog.Printf("error opening file: %v", err)
 	}