diff options
Diffstat (limited to 'core.go')
-rw-r--r-- | core.go | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -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 |