move get funcs to db

scanner/scanner.go

@@ -14,6 +14,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rainycape/unidecode"
 
+	"github.com/sentriz/gonic/db"
 	"github.com/sentriz/gonic/mime"
 	"github.com/sentriz/gonic/model"
 	"github.com/sentriz/gonic/scanner/stack"
@@ -51,14 +52,14 @@ func decoded(in string) string {
 	return result
 }
 
-func withTx(db *gorm.DB, cb func(tx *gorm.DB)) {
+func withTx(db *db.DB, cb func(tx *gorm.DB)) {
 	tx := db.Begin()
 	defer tx.Commit()
 	cb(tx)
 }
 
 type Scanner struct {
-	db        *gorm.DB
+	db        *db.DB
 	musicPath string
 	// these two are for the transaction we do for every folder.
 	// the boolean is there so we dont begin or commit multiple
@@ -78,7 +79,7 @@ type Scanner struct {
 	seenTracksErr int              // n tracks we we couldn't scan
 }
 
-func New(db *gorm.DB, musicPath string) *Scanner {
+func New(db *db.DB, musicPath string) *Scanner {
 	return &Scanner{
 		db:          db,
 		musicPath:   musicPath,

scanner/scanner_test.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"testing"
 
-	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 
 	"github.com/sentriz/gonic/db"
@@ -24,7 +23,7 @@ func init() {
 	log.SetOutput(ioutil.Discard)
 }
 
-func resetTables(db *gorm.DB) {
+func resetTables(db *db.DB) {
 	tx := db.Begin()
 	defer tx.Commit()
 	tx.Exec("delete from tracks")
@@ -32,7 +31,7 @@ func resetTables(db *gorm.DB) {
 	tx.Exec("delete from albums")
 }
 
-func resetTablesPause(db *gorm.DB, b *testing.B) {
+func resetTablesPause(db *db.DB, b *testing.B) {
 	b.StopTimer()
 	defer b.StartTimer()
 	resetTables(db)