move rddb to rhrd-go

13 files changed, 91 insertions, 555 deletions

diff --git a/.gitignore b/.gitignore
index 23950cf..7451f14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 bin/
 pkg/
 src/github.com
+src/helsinki.at/rhrd-go
+src/.rhrd-go.prepared
diff --git a/Makefile b/Makefile
index 0325c7c..1644e93 100644
--- a/Makefile
+++ b/Makefile
@@ -33,37 +33,56 @@ LIBS := "github.com/vaughan0/go-ini" \
         "github.com/spreadspace/telgo" \
         "github.com/gorilla/websocket"
 
-all: build test
 
-getlibs:
+.PHONY: getlibs build clean distclean _setenv
+all: build
+
+src/.rhrd-go.prepared:
+	@echo "fetching lib: helsinki.at/rhrd-go"
+	@cd src/; mkdir -p helsinki.at; cd helsinki.at; git clone git://git.helsinki.at/rhrd-go/ > /dev/null 2>&1
+	@touch $@
+
+
+getlibs: get-rhrd-go
 	@$(foreach lib,$(LIBS), echo "fetching lib: $(lib)"; $(GOCMD) get $(lib);)
 
-updatelibs:
+get-rhrd-go: src/.rhrd-go.prepared
+
+updatelibs: update-rhrd-go
 	@$(foreach lib,$(LIBS), echo "updating lib: $(lib)"; $(GOCMD) get -u $(lib);)
 
+update-rhrd-go: src/.rhrd-go.prepared
+	@echo "updating lib: helsinki.at/rhrd-go"
+	@cd src/helsinki.at/rhrd-go; git pull > /dev/null 2>&1
+
+
 vet:
 	@echo "vetting: $(EXECUTEABLE)"
 	@$(GOCMD) vet $(EXECUTEABLE)
 	@echo "vetting: helsinki.at/rhimport"
 	@$(GOCMD) vet helsinki.at/rhimport
 
+
 format:
 	@echo "formating: $(EXECUTEABLE)"
 	@$(GOCMD) fmt $(EXECUTEABLE)
 	@echo "formating: helsinki.at/rhimport"
 	@$(GOCMD) fmt helsinki.at/rhimport
 
+
 build: getlibs
 	@echo "installing: $(EXECUTEABLE)"
 	@$(GOCMD) install $(EXECUTEABLE)
 
+
 clean:
 	rm -rf pkg/*/helsinki.at
 	rm -rf pkg/*/$(EXECUTEABLE)
 	rm -rf bin
 
+
 distclean: clean
+	rm -rf src/helsinki.at/rhrd-go
+	rm src/.rhrd-go.prepared
 	rm -rf src/github.com
 	rm -rf pkg
-
-.PHONY: getlibs build test clean distclean _setenv
diff --git a/src/helsinki.at/rhimport/conf.go b/src/helsinki.at/rhimport/conf.go
index 2c91ed9..b7e8f88 100644
--- a/src/helsinki.at/rhimport/conf.go
+++ b/src/helsinki.at/rhimport/conf.go
@@ -24,10 +24,6 @@
 
 package rhimport
 
-import (
-	"github.com/vaughan0/go-ini"
-)
-
 type ImportParamDefaults struct {
 	Channels           uint
 	NormalizationLevel int
@@ -36,44 +32,14 @@ type ImportParamDefaults struct {
 }
 
 type Config struct {
-	configfile      string
 	RDXportEndpoint string
 	TempDir         string
-	dbHost          string
-	dbUser          string
-	dbPasswd        string
-	dbDb            string
 	LocalFetchDir   string
 	ImportParamDefaults
 }
 
-func getIniValue(file ini.File, section string, key string, dflt string) string {
-	value, ok := file.Get(section, key)
-	if ok {
-		return value
-	}
-	return dflt
-}
-
-func (self *Config) readConfigFile() error {
-	file, err := ini.LoadFile(self.configfile)
-	if err != nil {
-		return err
-	}
-
-	self.dbHost = getIniValue(file, "mySQL", "Hostname", "localhost")
-	self.dbUser = getIniValue(file, "mySQL", "Loginname", "rivendell")
-	self.dbPasswd = getIniValue(file, "mySQL", "Password", "letmein")
-	self.dbDb = getIniValue(file, "mySQL", "Database", "rivendell")
-	return nil
-}
-
-func NewConfig(configfile, rdxportEndpoint, tempDir, localFetchDir string) (conf *Config, err error) {
+func NewConfig(rdxportEndpoint, tempDir, localFetchDir string) (conf *Config) {
 	conf = new(Config)
-	conf.configfile = configfile
-	if err = conf.readConfigFile(); err != nil {
-		return
-	}
 	conf.RDXportEndpoint = rdxportEndpoint
 	conf.TempDir = tempDir
 	conf.LocalFetchDir = localFetchDir
diff --git a/src/helsinki.at/rhimport/core.go b/src/helsinki.at/rhimport/core.go
index b5c7784..8b6f982 100644
--- a/src/helsinki.at/rhimport/core.go
+++ b/src/helsinki.at/rhimport/core.go
@@ -27,6 +27,7 @@ package rhimport
 import (
 	"fmt"
 	"github.com/andelf/go-curl"
+	"helsinki.at/rhrd-go/rddb"
 	"io/ioutil"
 	"log"
 	"os"
@@ -63,7 +64,7 @@ type Result struct {
 
 type Context struct {
 	conf                 *Config
-	rddb                 *RdDbChan
+	db                   *rddb.DBChan
 	UserName             string
 	Password             string
 	Trusted              bool
@@ -86,10 +87,10 @@ type Context struct {
 	Cancel               <-chan bool
 }
 
-func NewContext(conf *Config, rddb *RdDbChan) *Context {
+func NewContext(conf *Config, db *rddb.DBChan) *Context {
 	ctx := new(Context)
 	ctx.conf = conf
-	ctx.rddb = rddb
+	ctx.db = db
 	ctx.UserName = ""
 	ctx.Password = ""
 	ctx.Trusted = false
@@ -157,28 +158,28 @@ func (ctx *Context) SanityCheck() error {
 }
 
 func (ctx *Context) getPassword(cached bool) (err error) {
-	ctx.Password, err = ctx.rddb.GetPassword(ctx.UserName, cached)
+	ctx.Password, err = ctx.db.GetPassword(ctx.UserName, cached)
 	return
 }
 
 func (ctx *Context) getGroupOfCart() (err error) {
-	ctx.GroupName, err = ctx.rddb.GetGroupOfCart(ctx.Cart)
+	ctx.GroupName, err = ctx.db.GetGroupOfCart(ctx.Cart)
 	return
 }
 
 func (ctx *Context) getShowInfo() (carts []uint, err error) {
-	ctx.GroupName, ctx.NormalizationLevel, ctx.AutotrimLevel, carts, err = ctx.rddb.GetShowInfo(ctx.ShowId)
+	ctx.GroupName, ctx.NormalizationLevel, ctx.AutotrimLevel, carts, err = ctx.db.GetShowInfo(ctx.ShowId)
 	ctx.Channels = 2
 	ctx.UseMetaData = true
 	return
 }
 
 func (ctx *Context) checkMusicGroup() (bool, error) {
-	return ctx.rddb.CheckMusicGroup(ctx.GroupName)
+	return ctx.db.CheckMusicGroup(ctx.GroupName)
 }
 
 func (ctx *Context) getMusicInfo() (err error) {
-	ctx.NormalizationLevel, ctx.AutotrimLevel, err = ctx.rddb.GetMusicInfo(ctx.GroupName)
+	ctx.NormalizationLevel, ctx.AutotrimLevel, err = ctx.db.GetMusicInfo(ctx.GroupName)
 	ctx.Channels = 2
 	ctx.UseMetaData = true
 	ctx.Cart = 0
diff --git a/src/helsinki.at/rhimport/fetcher.go b/src/helsinki.at/rhimport/fetcher.go
index 7a196e4..e5fa29f 100644
--- a/src/helsinki.at/rhimport/fetcher.go
+++ b/src/helsinki.at/rhimport/fetcher.go
@@ -259,7 +259,7 @@ func fetcherInit() {
 
 func checkPassword(ctx *Context, result *Result) (err error) {
 	ok := false
-	if ok, err = ctx.rddb.CheckPassword(ctx.UserName, ctx.Password); err != nil {
+	if ok, err = ctx.db.CheckPassword(ctx.UserName, ctx.Password); err != nil {
 		return
 	}
 	if !ok {
diff --git a/src/helsinki.at/rhimport/rddb.go b/src/helsinki.at/rhimport/rddb.go
deleted file mode 100644
index 4c9c6c8..0000000
--- a/src/helsinki.at/rhimport/rddb.go
+++ /dev/null
@@ -1,455 +0,0 @@
-//
-//  rhimportd
-//
-//  The Radio Helsinki Rivendell Import Daemon
-//
-//
-//  Copyright (C) 2015-2016 Christian Pointner <equinox@helsinki.at>
-//
-//  This file is part of rhimportd.
-//
-//  rhimportd is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  any later version.
-//
-//  rhimportd is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
-//
-
-package rhimport
-
-import (
-	"database/sql"
-	"fmt"
-	"github.com/ziutek/mymysql/godrv"
-	"regexp"
-	"strings"
-)
-
-var (
-	showMacroRe      = regexp.MustCompile(`^LL 1 ([^ ]+) 0\!$`)
-	mysqlTableNameRe = regexp.MustCompile(`^[_0-9a-zA-Z-]+$`)
-)
-
-const (
-	DB_VERSION = 245
-)
-
-type getPasswordResult struct {
-	password string
-	err      error
-}
-
-type getPasswordRequest struct {
-	username string
-	cached   bool
-	response chan<- getPasswordResult
-}
-
-type getGroupOfCartResult struct {
-	group string
-	err   error
-}
-
-type getGroupOfCartRequest struct {
-	cart     uint
-	response chan<- getGroupOfCartResult
-}
-
-type getShowInfoResult struct {
-	title   string
-	group   string
-	carts   []uint
-	normLvl int
-	trimLvl int
-	err     error
-}
-
-type getShowInfoRequest struct {
-	showid   uint
-	response chan<- getShowInfoResult
-}
-
-type checkMusicGroupResult struct {
-	ismusic bool
-	err     error
-}
-
-type checkMusicGroupRequest struct {
-	group    string
-	response chan<- checkMusicGroupResult
-}
-
-type getMusicInfoResult struct {
-	normLvl int
-	trimLvl int
-	err     error
-}
-
-type getMusicInfoRequest struct {
-	group    string
-	response chan<- getMusicInfoResult
-}
-
-type RdDb struct {
-	dbh                 *sql.DB
-	passwordCache       map[string]string
-	getPasswordChan     chan getPasswordRequest
-	getPasswordStmt     *sql.Stmt
-	getGroupOfCartChan  chan getGroupOfCartRequest
-	getGroupOfCartStmt  *sql.Stmt
-	getShowInfoChan     chan getShowInfoRequest
-	getShowInfoStmt     *sql.Stmt
-	checkMusicGroupChan chan checkMusicGroupRequest
-	checkMusicGroupStmt *sql.Stmt
-	getMusicInfoChan    chan getMusicInfoRequest
-	getMusicInfoStmt    *sql.Stmt
-	quit                chan bool
-	done                chan bool
-}
-
-func (self *RdDb) init(conf *Config) (err error) {
-	godrv.Register("SET CHARACTER SET utf8;")
-
-	dsn := fmt.Sprintf("tcp:%s:3306*%s/%s/%s", conf.dbHost, conf.dbDb, conf.dbUser, conf.dbPasswd)
-	if self.dbh, err = sql.Open("mymysql", dsn); err != nil {
-		return
-	}
-
-	var dbver int
-	err = self.dbh.QueryRow("select DB from VERSION;").Scan(&dbver)
-	if err != nil {
-		err = fmt.Errorf("fetching version: %s", err)
-		return
-	}
-	if dbver != DB_VERSION {
-		err = fmt.Errorf("version mismatch is %d, should be %d", dbver, DB_VERSION)
-		return
-	}
-
-	if self.getPasswordStmt, err = self.dbh.Prepare("select PASSWORD from USERS where LOGIN_NAME = ?;"); err != nil {
-		return
-	}
-	if self.getGroupOfCartStmt, err = self.dbh.Prepare("select NAME,DEFAULT_LOW_CART,DEFAULT_HIGH_CART from GROUPS where DEFAULT_LOW_CART <= ? and DEFAULT_HIGH_CART >= ?;"); err != nil {
-		return
-	}
-	if self.getShowInfoStmt, err = self.dbh.Prepare("select CART.TITLE,CART.MACROS,DROPBOXES.GROUP_NAME,DROPBOXES.NORMALIZATION_LEVEL,DROPBOXES.AUTOTRIM_LEVEL,GROUPS.DEFAULT_LOW_CART,GROUPS.DEFAULT_HIGH_CART from CART, DROPBOXES, GROUPS where CART.NUMBER = DROPBOXES.TO_CART and GROUPS.NAME = DROPBOXES.GROUP_NAME and CART.NUMBER = ?;"); err != nil {
-		return
-	}
-	if self.checkMusicGroupStmt, err = self.dbh.Prepare("select count(*) from DROPBOXES where GROUP_NAME = ? and SET_USER_DEFINED like \"M;%\";"); err != nil {
-		return
-	}
-	if self.getMusicInfoStmt, err = self.dbh.Prepare("select NORMALIZATION_LEVEL,AUTOTRIM_LEVEL from DROPBOXES where DROPBOXES.GROUP_NAME = ?;"); err != nil {
-		return
-	}
-	return
-}
-
-func (self *RdDb) getPassword(username string, cached bool) (result getPasswordResult) {
-	if cached {
-		result.password = self.passwordCache[username]
-	}
-
-	if result.password == "" {
-		if result.err = self.getPasswordStmt.QueryRow(username).Scan(&result.password); result.err != nil {
-			if result.err == sql.ErrNoRows {
-				result.err = fmt.Errorf("user '%s' not known by rivendell", username)
-			}
-			return
-		}
-		self.passwordCache[username] = result.password
-	}
-
-	return
-}
-
-func (self *RdDb) getGroupOfCart(cart uint) (result getGroupOfCartResult) {
-	var rows *sql.Rows
-	if rows, result.err = self.getGroupOfCartStmt.Query(cart, cart); result.err != nil {
-		return
-	}
-	defer rows.Close()
-	sizeMin := ^uint(0)
-	for rows.Next() {
-		var name string
-		var lowCart, highCart uint
-		if result.err = rows.Scan(&name, &lowCart, &highCart); result.err != nil {
-			return
-		}
-		if highCart >= lowCart {
-			size := (highCart - lowCart) + 1
-			if sizeMin > size {
-				result.group = name
-				sizeMin = size
-			}
-		}
-	}
-	if result.err = rows.Err(); result.err != nil {
-		return
-	}
-	if result.group == "" {
-		result.err = fmt.Errorf("cart is outside of all group cart ranges")
-	}
-	return
-}
-
-func (self *RdDb) getLogTableName(log string) (logtable string, err error) {
-	logtable = strings.Replace(log, " ", "_", -1) + "_LOG"
-	if !mysqlTableNameRe.MatchString(logtable) {
-		return "", fmt.Errorf("the log table name contains illegal charecters: %s", logtable)
-	}
-	return
-}
-
-func (self *RdDb) getShowCarts(log string, lowCart, highCart int) (carts []uint, err error) {
-	var logtable string
-	if logtable, err = self.getLogTableName(log); err != nil {
-		return
-	}
-	q := fmt.Sprintf("select CART_NUMBER from %s where CART_NUMBER >= %d and CART_NUMBER <= %d order by COUNT;", logtable, lowCart, highCart)
-	var rows *sql.Rows
-	if rows, err = self.dbh.Query(q); err != nil {
-		return
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var cart uint
-		if err = rows.Scan(&cart); err != nil {
-			return
-		}
-		carts = append(carts, cart)
-	}
-	err = rows.Err()
-	return
-}
-
-func (self *RdDb) getShowInfo(showid uint) (result getShowInfoResult) {
-	var macros string
-	var lowCart, highCart int
-	result.err = self.getShowInfoStmt.QueryRow(showid).Scan(&result.title, &macros, &result.group, &result.normLvl, &result.trimLvl, &lowCart, &highCart)
-	if result.err != nil {
-		if result.err == sql.ErrNoRows {
-			result.err = fmt.Errorf("show '%d' not found", showid)
-		}
-		return
-	}
-	result.normLvl /= 100
-	result.trimLvl /= 100
-	result.carts, result.err = self.getShowCarts(showMacroRe.FindStringSubmatch(macros)[1], lowCart, highCart)
-	return
-}
-
-func (self *RdDb) checkMusicGroup(group string) (result checkMusicGroupResult) {
-	var cnt int
-	if result.err = self.checkMusicGroupStmt.QueryRow(group).Scan(&cnt); result.err != nil {
-		if result.err == sql.ErrNoRows {
-			result.err = nil
-			result.ismusic = false
-		}
-		return
-	}
-	result.ismusic = cnt > 0
-	return
-}
-
-func (self *RdDb) getMusicInfo(group string) (result getMusicInfoResult) {
-	result.err = self.getMusicInfoStmt.QueryRow(group).Scan(&result.normLvl, &result.trimLvl)
-	if result.err != nil {
-		if result.err == sql.ErrNoRows {
-			result.err = fmt.Errorf("music pool '%s' not found", group)
-		}
-		return
-	}
-	return
-}
-
-func (self *RdDb) dispatchRequests() {
-	defer func() { self.done <- true }()
-	for {
-		select {
-		case <-self.quit:
-			return
-		case req := <-self.getPasswordChan:
-			req.response <- self.getPassword(req.username, req.cached)
-		case req := <-self.getGroupOfCartChan:
-			req.response <- self.getGroupOfCart(req.cart)
-		case req := <-self.getShowInfoChan:
-			req.response <- self.getShowInfo(req.showid)
-		case req := <-self.checkMusicGroupChan:
-			req.response <- self.checkMusicGroup(req.group)
-		case req := <-self.getMusicInfoChan:
-			req.response <- self.getMusicInfo(req.group)
-		}
-	}
-}
-
-// *********************************************************
-// Public Interface
-
-type RdDbChan struct {
-	getPasswordChan     chan<- getPasswordRequest
-	getGroupOfCartChan  chan<- getGroupOfCartRequest
-	getShowInfoChan     chan<- getShowInfoRequest
-	checkMusicGroupChan chan<- checkMusicGroupRequest
-	getMusicInfoChan    chan<- getMusicInfoRequest
-}
-
-func (self *RdDbChan) GetPassword(username string, cached bool) (string, error) {
-	resCh := make(chan getPasswordResult)
-	req := getPasswordRequest{}
-	req.username = username
-	req.cached = cached
-	req.response = resCh
-	self.getPasswordChan <- req
-
-	res := <-resCh
-	if res.err != nil {
-		return "", res.err
-	}
-	return res.password, nil
-}
-
-func (self *RdDbChan) CheckPassword(username, password string) (bool, error) {
-	cached := true
-
-	for {
-		resCh := make(chan getPasswordResult)
-		req := getPasswordRequest{}
-		req.username = username
-		req.cached = cached
-		req.response = resCh
-		self.getPasswordChan <- req
-
-		res := <-resCh
-		if res.err != nil {
-			return false, res.err
-		}
-		if password == res.password {
-			return true, nil
-		}
-		if cached {
-			cached = false
-		} else {
-			break
-		}
-	}
-	return false, nil
-}
-
-func (self *RdDbChan) GetGroupOfCart(cart uint) (string, error) {
-	resCh := make(chan getGroupOfCartResult)
-	req := getGroupOfCartRequest{}
-	req.cart = cart
-	req.response = resCh
-	self.getGroupOfCartChan <- req
-
-	res := <-resCh
-	if res.err != nil {
-		return "", res.err
-	}
-	return res.group, nil
-}
-
-func (self *RdDbChan) GetShowInfo(showid uint) (string, int, int, []uint, error) {
-	resCh := make(chan getShowInfoResult)
-	req := getShowInfoRequest{}
-	req.showid = showid
-	req.response = resCh
-	self.getShowInfoChan <- req
-
-	res := <-resCh
-	if res.err != nil {
-		return "", 0, 0, nil, res.err
-	}
-	return res.group, res.normLvl, res.trimLvl, res.carts, nil
-}
-
-func (self *RdDbChan) CheckMusicGroup(groupname string) (bool, error) {
-	resCh := make(chan checkMusicGroupResult)
-	req := checkMusicGroupRequest{}
-	req.group = groupname
-	req.response = resCh
-	self.checkMusicGroupChan <- req
-
-	res := <-resCh
-	if res.err != nil {
-		return false, res.err
-	}
-	return res.ismusic, nil
-}
-
-func (self *RdDbChan) GetMusicInfo(groupname string) (int, int, error) {
-	resCh := make(chan getMusicInfoResult)
-	req := getMusicInfoRequest{}
-	req.group = groupname
-	req.response = resCh
-	self.getMusicInfoChan <- req
-
-	res := <-resCh
-	if res.err != nil {
-		return 0, 0, res.err
-	}
-	return res.normLvl, res.trimLvl, nil
-}
-
-func (self *RdDb) GetInterface() *RdDbChan {
-	ch := &RdDbChan{}
-	ch.getPasswordChan = self.getPasswordChan
-	ch.getGroupOfCartChan = self.getGroupOfCartChan
-	ch.getShowInfoChan = self.getShowInfoChan
-	ch.checkMusicGroupChan = self.checkMusicGroupChan
-	ch.getMusicInfoChan = self.getMusicInfoChan
-	return ch
-}
-
-func (self *RdDb) Cleanup() {
-	self.quit <- true
-	<-self.done
-	close(self.quit)
-	close(self.done)
-	close(self.getPasswordChan)
-	if self.dbh != nil {
-		self.dbh.Close()
-	}
-	if self.getPasswordStmt != nil {
-		self.getPasswordStmt.Close()
-	}
-	if self.getGroupOfCartStmt != nil {
-		self.getGroupOfCartStmt.Close()
-	}
-	if self.getShowInfoStmt != nil {
-		self.getShowInfoStmt.Close()
-	}
-	if self.checkMusicGroupStmt != nil {
-		self.checkMusicGroupStmt.Close()
-	}
-	if self.getMusicInfoStmt != nil {
-		self.getMusicInfoStmt.Close()
-	}
-}
-
-func NewRdDb(conf *Config) (db *RdDb, err error) {
-	db = new(RdDb)
-
-	db.quit = make(chan bool)
-	db.done = make(chan bool)
-	db.passwordCache = make(map[string]string)
-	db.getPasswordChan = make(chan getPasswordRequest, 10)
-	db.getGroupOfCartChan = make(chan getGroupOfCartRequest, 10)
-	db.getShowInfoChan = make(chan getShowInfoRequest, 10)
-	db.checkMusicGroupChan = make(chan checkMusicGroupRequest, 10)
-	db.getMusicInfoChan = make(chan getMusicInfoRequest, 10)
-
-	if err = db.init(conf); err != nil {
-		return
-	}
-
-	go db.dispatchRequests()
-	return
-}
diff --git a/src/helsinki.at/rhimport/session_store.go b/src/helsinki.at/rhimport/session_store.go
index 8b48c0a..e47366e 100644
--- a/src/helsinki.at/rhimport/session_store.go
+++ b/src/helsinki.at/rhimport/session_store.go
@@ -28,6 +28,7 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
+	"helsinki.at/rhrd-go/rddb"
 	"net/http"
 )
 
@@ -90,7 +91,7 @@ type SessionStoreElement struct {
 type SessionStore struct {
 	store      map[string]map[string]*SessionStoreElement
 	conf       *Config
-	rddb       *RdDbChan
+	db         *rddb.DBChan
 	quit       chan bool
 	done       chan bool
 	newChan    chan newSessionRequest
@@ -111,7 +112,7 @@ func (self *SessionStore) new(ctx *Context, refId string) (resp newSessionRespon
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
 	if !ctx.Trusted {
-		if ok, err := self.rddb.CheckPassword(ctx.UserName, ctx.Password); err != nil {
+		if ok, err := self.db.CheckPassword(ctx.UserName, ctx.Password); err != nil {
 			resp.responsecode = http.StatusInternalServerError
 			resp.errorstring = err.Error()
 			return
@@ -130,7 +131,7 @@ func (self *SessionStore) new(ctx *Context, refId string) (resp newSessionRespon
 			self.store[ctx.UserName] = make(map[string]*SessionStoreElement)
 		}
 		ctx.conf = self.conf
-		ctx.rddb = self.rddb
+		ctx.db = self.db
 		s := &SessionStoreElement{newSession(ctx, func() { self.GetInterface().Remove(ctx.UserName, resp.id) }), refId}
 		self.store[ctx.UserName][resp.id] = s
 		resp.session = self.store[ctx.UserName][resp.id].s.getInterface()
@@ -156,7 +157,7 @@ func (self *SessionStore) list(user, password string, trusted bool) (resp listSe
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
 	if !trusted {
-		if ok, err := self.rddb.CheckPassword(user, password); err != nil {
+		if ok, err := self.db.CheckPassword(user, password); err != nil {
 			resp.responsecode = http.StatusInternalServerError
 			resp.errorstring = err.Error()
 			return
@@ -292,10 +293,10 @@ func (self *SessionStore) Cleanup() {
 	close(self.removeChan)
 }
 
-func NewSessionStore(conf *Config, rddb *RdDbChan) (store *SessionStore, err error) {
+func NewSessionStore(conf *Config, db *rddb.DBChan) (store *SessionStore, err error) {
 	store = new(SessionStore)
 	store.conf = conf
-	store.rddb = rddb
+	store.db = db
 	store.quit = make(chan bool)
 	store.done = make(chan bool)
 	store.store = make(map[string]map[string]*SessionStoreElement)
diff --git a/src/rhimportd/ctrlTelnet.go b/src/rhimportd/ctrlTelnet.go
index 5d0aebe..974627d 100644
--- a/src/rhimportd/ctrlTelnet.go
+++ b/src/rhimportd/ctrlTelnet.go
@@ -28,16 +28,17 @@ import (
 	"fmt"
 	"github.com/spreadspace/telgo"
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"net/http"
 	"strconv"
 	"strings"
 )
 
-func telnetQuit(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetQuit(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	return true
 }
 
-func telnetHelp(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetHelp(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	switch len(args) {
 	case 2:
 		switch args[1] {
@@ -145,7 +146,7 @@ func telnetSetBool(c *telgo.Client, param *bool, val string) {
 	}
 }
 
-func telnetSet(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetSet(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	if len(args) != 3 {
 		c.Sayln("wrong number of arguments")
 		return false
@@ -153,7 +154,7 @@ func telnetSet(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhim
 
 	var ctx *rhimport.Context
 	if c.UserData == nil {
-		c.UserData = rhimport.NewContext(conf, rddb)
+		c.UserData = rhimport.NewContext(conf, db)
 		ctx = c.UserData.(*rhimport.Context)
 		ctx.Trusted = false
 	} else {
@@ -192,7 +193,7 @@ func telnetSet(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhim
 	return false
 }
 
-func telnetReset(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetReset(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	if len(args) > 1 {
 		c.Sayln("too many arguments")
 		return false
@@ -202,7 +203,7 @@ func telnetReset(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rh
 	return false
 }
 
-func telnetShow(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetShow(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	if len(args) > 1 {
 		c.Sayln("too many arguments")
 		return false
@@ -235,7 +236,7 @@ func telnetProgressCallback(step int, stepName string, progress float64, userdat
 	return true
 }
 
-func telnetRun(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhimport.RdDbChan) bool {
+func telnetRun(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.DBChan) bool {
 	if c.UserData == nil {
 		c.Sayln("context is empty please set at least one option")
 		return false
@@ -275,14 +276,14 @@ func telnetRun(c *telgo.Client, args []string, conf *rhimport.Config, rddb *rhim
 	return false
 }
 
-func StartControlTelnet(addr string, conf *rhimport.Config, rddb *rhimport.RdDbChan, sessions *rhimport.SessionStoreChan) {
+func StartControlTelnet(addr string, conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan) {
 	cmdlist := make(telgo.CmdList)
-	cmdlist["quit"] = func(c *telgo.Client, args []string) bool { return telnetQuit(c, args, conf, rddb) }
-	cmdlist["help"] = func(c *telgo.Client, args []string) bool { return telnetHelp(c, args, conf, rddb) }
-	cmdlist["set"] = func(c *telgo.Client, args []string) bool { return telnetSet(c, args, conf, rddb) }
-	cmdlist["reset"] = func(c *telgo.Client, args []string) bool { return telnetReset(c, args, conf, rddb) }
-	cmdlist["show"] = func(c *telgo.Client, args []string) bool { return telnetShow(c, args, conf, rddb) }
-	cmdlist["run"] = func(c *telgo.Client, args []string) bool { return telnetRun(c, args, conf, rddb) }
+	cmdlist["quit"] = func(c *telgo.Client, args []string) bool { return telnetQuit(c, args, conf, db) }
+	cmdlist["help"] = func(c *telgo.Client, args []string) bool { return telnetHelp(c, args, conf, db) }
+	cmdlist["set"] = func(c *telgo.Client, args []string) bool { return telnetSet(c, args, conf, db) }
+	cmdlist["reset"] = func(c *telgo.Client, args []string) bool { return telnetReset(c, args, conf, db) }
+	cmdlist["show"] = func(c *telgo.Client, args []string) bool { return telnetShow(c, args, conf, db) }
+	cmdlist["run"] = func(c *telgo.Client, args []string) bool { return telnetRun(c, args, conf, db) }
 
 	rhl.Println("telnet-ctrl: listening on", addr)
 	s := telgo.NewServer(addr, "rhimportd> ", cmdlist, nil)
diff --git a/src/rhimportd/ctrlWatchDir.go b/src/rhimportd/ctrlWatchDir.go
index 6f84c15..037f8ea 100644
--- a/src/rhimportd/ctrlWatchDir.go
+++ b/src/rhimportd/ctrlWatchDir.go
@@ -28,6 +28,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -97,7 +98,7 @@ func watchDirResponse(filename string, result *rhimport.Result) {
 	watchDirWriteResponse(filename, &watchDirResponseData{result.ResponseCode, result.ErrorString, result.Cart, result.Cut})
 }
 
-func watchDirParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, req *os.File) (ctx *rhimport.Context, err error) {
+func watchDirParseRequest(conf *rhimport.Config, db *rddb.DBChan, req *os.File) (ctx *rhimport.Context, err error) {
 
 	decoder := json.NewDecoder(req)
 	reqdata := newWatchDirRequestData(conf)
@@ -106,7 +107,7 @@ func watchDirParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, req *o
 		return
 	}
 
-	ctx = rhimport.NewContext(conf, rddb)
+	ctx = rhimport.NewContext(conf, db)
 	ctx.UserName = reqdata.UserName
 	ctx.Trusted = true
 	ctx.ShowId = reqdata.ShowId
@@ -123,7 +124,7 @@ func watchDirParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, req *o
 	return
 }
 
-func watchDirHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, ctx *rhimport.Context, filename string) {
+func watchDirHandler(conf *rhimport.Config, db *rddb.DBChan, ctx *rhimport.Context, filename string) {
 	rhdl.Printf("WatchDirHandler: request for '%s'", filename)
 
 	var err error
@@ -156,7 +157,7 @@ func watchDirHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, ctx *rhimpo
 	return
 }
 
-func watchDirRun(dir *os.File, conf *rhimport.Config, rddb *rhimport.RdDbChan) {
+func watchDirRun(dir *os.File, conf *rhimport.Config, db *rddb.DBChan) {
 	rhl.Printf("watch-dir-ctrl: watching for files in %s", dir.Name())
 	for {
 		var err error
@@ -181,11 +182,11 @@ func watchDirRun(dir *os.File, conf *rhimport.Config, rddb *rhimport.RdDbChan) {
 					rhl.Printf("watch-dir-ctrl: error reading new file: %s", err)
 					continue
 				}
-				if ctx, err := watchDirParseRequest(conf, rddb, file); err == nil {
+				if ctx, err := watchDirParseRequest(conf, db, file); err == nil {
 					file.Close()
 					dstname := strings.TrimSuffix(srcname, ".new") + ".running"
 					os.Rename(srcname, dstname)
-					go watchDirHandler(conf, rddb, ctx, dstname)
+					go watchDirHandler(conf, db, ctx, dstname)
 				} else { // ignoring files with json errors -> maybe the file has not been written completely
 					file.Close()
 					rhdl.Printf("watch-dir-ctrl: new file %s parser error: %s, ignoring for now", srcname, err)
@@ -197,7 +198,7 @@ func watchDirRun(dir *os.File, conf *rhimport.Config, rddb *rhimport.RdDbChan) {
 	}
 }
 
-func StartWatchDir(dirname string, conf *rhimport.Config, rddb *rhimport.RdDbChan) {
+func StartWatchDir(dirname string, conf *rhimport.Config, db *rddb.DBChan) {
 	for {
 		time.Sleep(5 * time.Second)
 		dir, err := os.Open(dirname)
@@ -214,6 +215,6 @@ func StartWatchDir(dirname string, conf *rhimport.Config, rddb *rhimport.RdDbCha
 				continue
 			}
 		}
-		watchDirRun(dir, conf, rddb)
+		watchDirRun(dir, conf, db)
 	}
 }
diff --git a/src/rhimportd/ctrlWeb.go b/src/rhimportd/ctrlWeb.go
index c1cd4b5..46e384a 100644
--- a/src/rhimportd/ctrlWeb.go
+++ b/src/rhimportd/ctrlWeb.go
@@ -26,6 +26,7 @@ package main
 
 import (
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"net/http"
 	_ "net/http/pprof"
 	"time"
@@ -33,21 +34,21 @@ import (
 
 type webHandler struct {
 	*rhimport.Config
-	*rhimport.RdDbChan
+	*rddb.DBChan
 	*rhimport.SessionStoreChan
 	trusted bool
-	H       func(*rhimport.Config, *rhimport.RdDbChan, *rhimport.SessionStoreChan, bool, http.ResponseWriter, *http.Request)
+	H       func(*rhimport.Config, *rddb.DBChan, *rhimport.SessionStoreChan, bool, http.ResponseWriter, *http.Request)
 }
 
 func (self webHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	self.H(self.Config, self.RdDbChan, self.SessionStoreChan, self.trusted, w, r)
+	self.H(self.Config, self.DBChan, self.SessionStoreChan, self.trusted, w, r)
 }
 
-func StartControlWeb(addr string, conf *rhimport.Config, rddb *rhimport.RdDbChan, sessions *rhimport.SessionStoreChan) {
-	http.Handle("/public/simple", webHandler{conf, rddb, sessions, false, webSimpleHandler})
-	//	http.Handle("/trusted/simple", webHandler{conf, rddb, sessions, true, webSimpleHandler})
+func StartControlWeb(addr string, conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan) {
+	http.Handle("/public/simple", webHandler{conf, db, sessions, false, webSimpleHandler})
+	//	http.Handle("/trusted/simple", webHandler{conf, db, sessions, true, webSimpleHandler})
 
-	http.Handle("/public/socket", webHandler{conf, rddb, sessions, false, webSocketHandler})
+	http.Handle("/public/socket", webHandler{conf, db, sessions, false, webSocketHandler})
 
 	rhl.Println("web-ctrl: listening on", addr)
 	server := &http.Server{Addr: addr, ReadTimeout: 60 * time.Second, WriteTimeout: 60 * time.Second}
diff --git a/src/rhimportd/ctrlWebSimple.go b/src/rhimportd/ctrlWebSimple.go
index cd2c556..15f06ee 100644
--- a/src/rhimportd/ctrlWebSimple.go
+++ b/src/rhimportd/ctrlWebSimple.go
@@ -28,6 +28,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"html"
 	"net/http"
 )
@@ -90,7 +91,7 @@ func webSimpleResponse(w http.ResponseWriter, result *rhimport.Result) {
 	encoder.Encode(respdata)
 }
 
-func webSimpleParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, trusted bool, r *http.Request) (ctx *rhimport.Context, err error) {
+func webSimpleParseRequest(conf *rhimport.Config, db *rddb.DBChan, trusted bool, r *http.Request) (ctx *rhimport.Context, err error) {
 
 	decoder := json.NewDecoder(r.Body)
 	reqdata := newWebSimpleRequestData(conf)
@@ -99,7 +100,7 @@ func webSimpleParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, trust
 		return
 	}
 
-	ctx = rhimport.NewContext(conf, rddb)
+	ctx = rhimport.NewContext(conf, db)
 	if trusted {
 		ctx.UserName = r.Header.Get("X-Forwarded-User")
 	} else {
@@ -121,12 +122,12 @@ func webSimpleParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, trust
 	return
 }
 
-func webSimpleHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, sessions *rhimport.SessionStoreChan, trusted bool, w http.ResponseWriter, r *http.Request) {
+func webSimpleHandler(conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan, trusted bool, w http.ResponseWriter, r *http.Request) {
 	rhdl.Printf("WebSimpleHandler: request for '%s'", html.EscapeString(r.URL.Path))
 
 	var ctx *rhimport.Context
 	var err error
-	if ctx, err = webSimpleParseRequest(conf, rddb, trusted, r); err != nil {
+	if ctx, err = webSimpleParseRequest(conf, db, trusted, r); err != nil {
 		webSimpleErrorResponse(w, http.StatusBadRequest, err.Error())
 		return
 	}
diff --git a/src/rhimportd/ctrlWebSocket.go b/src/rhimportd/ctrlWebSocket.go
index a0386f1..0fd83f0 100644
--- a/src/rhimportd/ctrlWebSocket.go
+++ b/src/rhimportd/ctrlWebSocket.go
@@ -28,6 +28,7 @@ import (
 	"fmt"
 	"github.com/gorilla/websocket"
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"html"
 	"math"
 	"net/http"
@@ -302,7 +303,7 @@ func webSocketSessionHandler(reqchan <-chan webSocketRequestData, ws *websocket.
 	}
 }
 
-func webSocketHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, sessions *rhimport.SessionStoreChan, trusted bool, w http.ResponseWriter, r *http.Request) {
+func webSocketHandler(conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan, trusted bool, w http.ResponseWriter, r *http.Request) {
 	rhdl.Printf("WebSocketHandler: request for '%s'", html.EscapeString(r.URL.Path))
 
 	ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
diff --git a/src/rhimportd/main.go b/src/rhimportd/main.go
index d941b05..e9608c1 100644
--- a/src/rhimportd/main.go
+++ b/src/rhimportd/main.go
@@ -28,6 +28,7 @@ import (
 	"flag"
 	"fmt"
 	"helsinki.at/rhimport"
+	"helsinki.at/rhrd-go/rddb"
 	"io/ioutil"
 	"log"
 	"os"
@@ -88,20 +89,16 @@ func main() {
 		return
 	}
 
-	conf, err := rhimport.NewConfig(rdconf.Get().(string), rdxportUrl.Get().(string), tempDir.Get().(string), localFetchDir.Get().(string))
-	if err != nil {
-		rhl.Println("Error reading configuration:", err)
-		return
-	}
+	conf := rhimport.NewConfig(rdxportUrl.Get().(string), tempDir.Get().(string), localFetchDir.Get().(string))
 
-	rddb, err := rhimport.NewRdDb(conf)
+	db, err := rddb.NewDB(rdconf.Get().(string))
 	if err != nil {
 		rhl.Println("Error initializing Rivdenll DB:", err)
 		return
 	}
-	defer rddb.Cleanup()
+	defer db.Cleanup()
 
-	sessions, err := rhimport.NewSessionStore(conf, rddb.GetInterface())
+	sessions, err := rhimport.NewSessionStore(conf, db.GetInterface())
 	if err != nil {
 		rhl.Println("Error initializing Session Store:", err)
 		return
@@ -115,7 +112,7 @@ func main() {
 		go func() {
 			defer wg.Done()
 			rhl.Println("starting web-ctrl")
-			StartControlWeb(webAddr.Get().(string), conf, rddb.GetInterface(), sessions.GetInterface())
+			StartControlWeb(webAddr.Get().(string), conf, db.GetInterface(), sessions.GetInterface())
 			rhl.Println("web-ctrl finished")
 		}()
 	}
@@ -125,7 +122,7 @@ func main() {
 		go func() {
 			defer wg.Done()
 			rhl.Println("starting telnet-ctrl")
-			StartControlTelnet(telnetAddr.Get().(string), conf, rddb.GetInterface(), sessions.GetInterface())
+			StartControlTelnet(telnetAddr.Get().(string), conf, db.GetInterface(), sessions.GetInterface())
 			rhl.Println("telnet-ctrl finished")
 		}()
 	}
@@ -135,7 +132,7 @@ func main() {
 		go func() {
 			defer wg.Done()
 			rhl.Println("starting watch-dir-ctrl")
-			StartWatchDir(watchDir.Get().(string), conf, rddb.GetInterface())
+			StartWatchDir(watchDir.Get().(string), conf, db.GetInterface())
 			rhl.Println("watch-dir-ctrl finished")
 		}()
 	}