Updated to latest GTK2 bindings API and moved to Gitlab.

database/database_object.go

@@ -10,85 +10,84 @@
 package database
 
 import (
-    // stdlib
-    //"database/sql"
-    "fmt"
-    "path"
-    "runtime"
-    "strconv"
+	// stdlib
+	//"database/sql"
+	"fmt"
+	"path"
+	"runtime"
+	"strconv"
 
-    // local
-    "github.com/pztrn/urtrator/configuration"
-    "github.com/pztrn/urtrator/datamodels"
+	// local
+	"gitlab.com/pztrn/urtrator/configuration"
+	"gitlab.com/pztrn/urtrator/datamodels"
 
-    // Other
-    "github.com/jmoiron/sqlx"
-    _ "github.com/mattn/go-sqlite3"
+	// Other
+	"github.com/jmoiron/sqlx"
+	_ "github.com/mattn/go-sqlite3"
 )
 
 type Database struct {
-    // Configuration.
-    cfg *configuration.Config
-    // Pointer to initialized database connection.
-    Db *sqlx.DB
+	// Configuration.
+	cfg *configuration.Config
+	// Pointer to initialized database connection.
+	Db *sqlx.DB
 }
 
 func (d *Database) Close() {
-    fmt.Println("Closing database...")
+	fmt.Println("Closing database...")
 
-    // Save configuration.
-    // Delete previous configuration.
-    d.Db.MustExec("DELETE FROM configuration")
-    tx := d.Db.MustBegin()
-    for k, v := range cfg.Cfg {
-        cfg_item := datamodels.Configuration{}
-        cfg_item.Key = k
-        cfg_item.Value = v
-        tx.NamedExec("INSERT INTO configuration (key, value) VALUES (:key, :value)", &cfg_item)
-    }
-    tx.Commit()
+	// Save configuration.
+	// Delete previous configuration.
+	d.Db.MustExec("DELETE FROM configuration")
+	tx := d.Db.MustBegin()
+	for k, v := range cfg.Cfg {
+		cfg_item := datamodels.Configuration{}
+		cfg_item.Key = k
+		cfg_item.Value = v
+		tx.NamedExec("INSERT INTO configuration (key, value) VALUES (:key, :value)", &cfg_item)
+	}
+	tx.Commit()
 
-    d.Db.Close()
+	d.Db.Close()
 
-    runtime.UnlockOSThread()
+	runtime.UnlockOSThread()
 }
 
 func (d *Database) Initialize(cfg *configuration.Config) {
-    fmt.Println("Initializing database...")
+	fmt.Println("Initializing database...")
 
-    runtime.LockOSThread()
+	runtime.LockOSThread()
 
-    // Connect to database.
-    db_path := path.Join(cfg.TEMP["DATA"], "database.sqlite3")
-    fmt.Println("Database path: " + db_path)
-    db, err := sqlx.Connect("sqlite3", db_path)
-    if err != nil {
-        fmt.Println(err.Error())
-    }
-    d.Db = db
+	// Connect to database.
+	db_path := path.Join(cfg.TEMP["DATA"], "database.sqlite3")
+	fmt.Println("Database path: " + db_path)
+	db, err := sqlx.Connect("sqlite3", db_path)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	d.Db = db
 
-    // Load configuration.
-    cfgs := []datamodels.Configuration{}
-    d.Db.Select(&cfgs, "SELECT * FROM configuration")
-    if len(cfgs) > 0 {
-        for i := range cfgs {
-            cfg.Cfg[cfgs[i].Key] = cfgs[i].Value
-        }
-    }
+	// Load configuration.
+	cfgs := []datamodels.Configuration{}
+	d.Db.Select(&cfgs, "SELECT * FROM configuration")
+	if len(cfgs) > 0 {
+		for i := range cfgs {
+			cfg.Cfg[cfgs[i].Key] = cfgs[i].Value
+		}
+	}
 }
 
 func (d *Database) Migrate() {
-    // Getting current database version.
-    dbver := 0
-    database := []datamodels.Database{}
-    d.Db.Select(&database, "SELECT * FROM database")
-    if len(database) > 0 {
-        fmt.Println("Current database version: " + database[0].Version)
-        dbver, _ = strconv.Atoi(database[0].Version)
-    } else {
-        fmt.Println("No database found, will create new one")
-    }
+	// Getting current database version.
+	dbver := 0
+	database := []datamodels.Database{}
+	d.Db.Select(&database, "SELECT * FROM database")
+	if len(database) > 0 {
+		fmt.Println("Current database version: " + database[0].Version)
+		dbver, _ = strconv.Atoi(database[0].Version)
+	} else {
+		fmt.Println("No database found, will create new one")
+	}
 
-
-    migrate_full(d, dbver)
+	migrate_full(d, dbver)
 }

database/exported.go

@@ -10,16 +10,16 @@
 package database
 
 import (
-    // Local
-    "github.com/pztrn/urtrator/configuration"
+	// Local
+	"gitlab.com/pztrn/urtrator/configuration"
 )
 
 var (
-    cfg *configuration.Config
+	cfg *configuration.Config
 )
 
 func New(c *configuration.Config) *Database {
-    cfg = c
-    d := Database{}
-    return &d
+	cfg = c
+	d := Database{}
+	return &d
 }