Make watcher scan all directories for client, start adding user

management to server with socket communication via admin binary

server/database.go

@@ -1,100 +0,0 @@
-package main
-
-import (
-	"asink"
-	"database/sql"
-	_ "github.com/mattn/go-sqlite3"
-	"sync"
-)
-
-type AsinkDB struct {
-	db   *sql.DB
-	lock sync.Mutex
-}
-
-func GetAndInitDB() (*AsinkDB, error) {
-	dbLocation := "asink-server.db" //TODO make me configurable
-
-	db, err := sql.Open("sqlite3", "file:"+dbLocation+"?cache=shared&mode=rwc")
-	if err != nil {
-		return nil, err
-	}
-
-	//make sure the events table is created
-	tx, err := db.Begin()
-	if err != nil {
-		return nil, err
-	}
-	rows, err := tx.Query("SELECT name FROM sqlite_master WHERE type='table' AND name='events';")
-	if err != nil {
-		return nil, err
-	}
-	if !rows.Next() {
-		//if this is false, it means no rows were returned
-		tx.Exec("CREATE TABLE events (id INTEGER PRIMARY KEY ASC, localid INTEGER, type INTEGER, status INTEGER, path TEXT, hash TEXT, predecessor TEXT, timestamp INTEGER, permissions INTEGER);")
-		tx.Exec("CREATE INDEX IF NOT EXISTS pathidx on events (path);")
-	}
-	err = tx.Commit()
-	if err != nil {
-		return nil, err
-	}
-
-	ret := new(AsinkDB)
-	ret.db = db
-	return ret, nil
-}
-
-func (adb *AsinkDB) DatabaseAddEvent(e *asink.Event) (err error) {
-	adb.lock.Lock()
-	tx, err := adb.db.Begin()
-	if err != nil {
-		return err
-	}
-
-	//make sure the transaction gets rolled back on error, and the database gets unlocked
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-		adb.lock.Unlock()
-	}()
-
-	result, err := tx.Exec("INSERT INTO events (localid, type, status, path, hash, predecessor, timestamp, permissions) VALUES (?,?,?,?,?,?,?,?);", e.LocalId, e.Type, e.Status, e.Path, e.Hash, e.Predecessor, e.Timestamp, e.Permissions)
-	if err != nil {
-		return err
-	}
-	id, err := result.LastInsertId()
-	if err != nil {
-		return err
-	}
-	err = tx.Commit()
-	if err != nil {
-		return err
-	}
-
-	e.Id = id
-	e.InDB = true
-	return nil
-}
-
-func (adb *AsinkDB) DatabaseRetrieveEvents(firstId uint64, maxEvents uint) (events []*asink.Event, err error) {
-	adb.lock.Lock()
-	//make sure the database gets unlocked on return
-	defer func() {
-		adb.lock.Unlock()
-	}()
-	rows, err := adb.db.Query("SELECT id, localid, type, status, path, hash, predecessor, timestamp, permissions FROM events WHERE id >= ? ORDER BY id ASC LIMIT ?;", firstId, maxEvents)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var event asink.Event
-		err = rows.Scan(&event.Id, &event.LocalId, &event.Type, &event.Status, &event.Path, &event.Hash, &event.Predecessor, &event.Timestamp, &event.Permissions)
-		if err != nil {
-			return nil, err
-		}
-		events = append(events, &event)
-	}
-
-	return events, nil
-}