8.diff (2035B)
1 diff --git a/pkg/app/main.go b/pkg/app/main.go 2 index 255f074..3b7aa0e 100644 3 --- a/pkg/app/main.go 4 +++ b/pkg/app/main.go 5 @@ -52,7 +52,7 @@ func Start(argsArg []string) error { 6 } 7 8 widgets.QApplication_Exec() 9 - 10 + 11 return nil 12 } 13 14 diff --git a/pkg/db/implementation/db.go b/pkg/db/implementation/db.go 15 deleted file mode 100644 16 index 9429d4b..0000000 17 --- a/pkg/db/implementation/db.go 18 +++ /dev/null 19 @@ -1,51 +0,0 @@ 20 -package implementation 21 - 22 -import ( 23 - "database/sql" 24 - "fmt" 25 - _ "github.com/mattn/go-sqlite3" // Go-sqlite3 side effect import needed to use SQLite3 databases 26 - "github.com/shibukawa/configdir" 27 - "log" 28 - "path/filepath" 29 -) 30 - 31 -var db *sql.DB 32 - 33 -// Init prepares the DB by opening it and creating the required tables if needed 34 -// TODO: Make part of the interface 35 -func Init() (err error) { 36 - log.Println("Start setting up DB") 37 - var openErr error 38 - 39 - // Open the data.db file. It will be created if it doesn't exist. 40 - configDirs := configdir.New("Nordgedanken", "Morpheusv2") 41 - filePath := filepath.ToSlash(configDirs.QueryFolders(configdir.Global)[0].Path) 42 - 43 - log.Println("DBFilePath: ", filePath+"/data.db") 44 - db, openErr = sql.Open("sqlite3", filePath+"/data.db") 45 - if openErr != nil { 46 - err = openErr 47 - return 48 - } 49 - 50 - log.Println("Creating DB Tables if needed") 51 - createTables := `CREATE TABLE IF NOT EXISTS users (id integer not null primary key, display_name text, avatar text); 52 - CREATE TABLE IF NOT EXISTS messages (id integer not null primary key, author text, message text, timestamp text, pure_event text); 53 - 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); 54 - ` 55 - _, execErr := db.Exec(createTables) 56 - if execErr != nil { 57 - err = fmt.Errorf("DB EXEC ERR: %s", execErr) 58 - return 59 - } 60 - log.Println("Finished setting DB Setup") 61 - return 62 -} 63 - 64 -// Open returns the in Init() created db variable 65 -func Open() *sql.DB { 66 - if db != nil { 67 - return db 68 - } 69 - return nil 70 -}