morpheusv2

commit 3ddecfe3eeb6a4eadb1ec42917200b7625101b7e
parent 3ee72a9f7951c4301c6727ccadbfecc2f2e7362c
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Sun,  6 May 2018 01:18:30 +0200

Remove weird whitespace and cleanup Code (#8)


Diffstat:
M
pkg/app/main.go
 | 
2
+-
D
pkg/db/implementation/db.go
 | 
51
---------------------------------------------------

2 files changed, 1 insertion(+), 52 deletions(-)
diff --git a/pkg/app/main.go b/pkg/app/main.go
@@ -52,7 +52,7 @@ func Start(argsArg []string) error {
 	}
 
 	widgets.QApplication_Exec()
-  
+
 	return nil
 }
 
diff --git a/pkg/db/implementation/db.go b/pkg/db/implementation/db.go
@@ -1,51 +0,0 @@
-package implementation
-
-import (
-	"database/sql"
-	"fmt"
-	_ "github.com/mattn/go-sqlite3" // Go-sqlite3 side effect import needed to use SQLite3 databases
-	"github.com/shibukawa/configdir"
-	"log"
-	"path/filepath"
-)
-
-var db *sql.DB
-
-// Init prepares the DB by opening it and creating the required tables if needed
-// TODO: Make part of the interface
-func Init() (err error) {
-	log.Println("Start setting up DB")
-	var openErr error
-
-	// Open the data.db file. It will be created if it doesn't exist.
-	configDirs := configdir.New("Nordgedanken", "Morpheusv2")
-	filePath := filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path)
-
-	log.Println("DBFilePath: ", filePath+"/data.db")
-	db, openErr = sql.Open("sqlite3", filePath+"/data.db")
-	if openErr != nil {
-		err = openErr
-		return
-	}
-
-	log.Println("Creating DB Tables if needed")
-	createTables := `CREATE TABLE IF NOT EXISTS users (id integer not null primary key, display_name text, avatar text);
-					CREATE TABLE IF NOT EXISTS messages (id integer not null primary key, author text, message text, timestamp text, pure_event text);
-					CREATE TABLE IF NOT EXISTS rooms (id integer not null primary key, room_aliases text, room_id text, room_name text, room_avatar text, room_topic text, room_messages text);
-					`
-	_, execErr := db.Exec(createTables)
-	if execErr != nil {
-		err = fmt.Errorf("DB EXEC ERR: %s", execErr)
-		return
-	}
-	log.Println("Finished setting DB Setup")
-	return
-}
-
-// Open returns the in Init() created db variable
-func Open() *sql.DB {
-	if db != nil {
-		return db
-	}
-	return nil
-}