WIP: Make storage pluggable

cmd/compare.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
-	"github.com/AndreasSko/go-jwlm/model"
+	"github.com/AndreasSko/go-jwlm/storage"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -24,15 +24,13 @@ var compareCmd = &cobra.Command{
 
 func compare(leftFilename string, rightFilename string, stdio terminal.Stdio) {
 	fmt.Fprintln(stdio.Out, "Importing left backup")
-	left := &model.Database{}
-	err := left.ImportJWLBackup(leftFilename)
+	left, err := storage.ImportJWLBackup(leftFilename)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	fmt.Fprintln(stdio.Out, "Importing right backup")
-	right := &model.Database{}
-	err = right.ImportJWLBackup(rightFilename)
+	right, err := storage.ImportJWLBackup(rightFilename)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/compare_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
+	"github.com/AndreasSko/go-jwlm/storage"
 	expect "github.com/Netflix/go-expect"
 	"github.com/stretchr/testify/assert"
 )
@@ -24,9 +25,9 @@ func Test_compare(t *testing.T) {
 	emptyFilename := filepath.Join(tmp, "empty.jwlibrary")
 	leftFilename := filepath.Join(tmp, "left.jwlibrary")
 	rightFilename := filepath.Join(tmp, "right.jwlibrary")
-	assert.NoError(t, emptyDB.ExportJWLBackup(emptyFilename))
-	assert.NoError(t, leftDB.ExportJWLBackup(leftFilename))
-	assert.NoError(t, rightDB.ExportJWLBackup(rightFilename))
+	assert.NoError(t, storage.ExportJWLBackup(emptyDB, emptyFilename))
+	assert.NoError(t, storage.ExportJWLBackup(leftDB, leftFilename))
+	assert.NoError(t, storage.ExportJWLBackup(rightDB, rightFilename))
 
 	RunCmdTest(t,
 		func(t *testing.T, c *expect.Console) {

cmd/merge.go

@@ -9,6 +9,7 @@ import (
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/AndreasSko/go-jwlm/merger"
 	"github.com/AndreasSko/go-jwlm/model"
+	"github.com/AndreasSko/go-jwlm/storage"
 	"github.com/buger/goterm"
 	"github.com/jedib0t/go-pretty/table"
 	"github.com/spf13/cobra"
@@ -51,15 +52,13 @@ var InputFieldResolver string
 
 func merge(leftFilename string, rightFilename string, mergedFilename string, stdio terminal.Stdio) {
 	fmt.Fprintln(stdio.Out, "Importing left backup")
-	left := model.Database{}
-	err := left.ImportJWLBackup(leftFilename)
+	left, err := storage.ImportJWLBackup(leftFilename)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	fmt.Fprintln(stdio.Out, "Importing right backup")
-	right := model.Database{}
-	err = right.ImportJWLBackup(rightFilename)
+	right, err := storage.ImportJWLBackup(rightFilename)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -229,7 +228,7 @@ func merge(leftFilename string, rightFilename string, mergedFilename string, std
 	fmt.Fprintln(stdio.Out, "🎉 Finished merging!")
 
 	fmt.Fprintln(stdio.Out, "Exporting merged database")
-	if err = merged.ExportJWLBackup(mergedFilename); err != nil {
+	if err = storage.ExportJWLBackup(&merged, mergedFilename); err != nil {
 		log.Fatal(err)
 	}
 

cmd/merge_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/AndreasSko/go-jwlm/model"
+	"github.com/AndreasSko/go-jwlm/storage"
 	expect "github.com/Netflix/go-expect"
 	"github.com/hinshun/vt10x"
 	"github.com/stretchr/testify/assert"
@@ -31,11 +32,11 @@ func Test_merge(t *testing.T) {
 	mergedFilename := filepath.Join(tmp, "merged.jwlibrary")
 	leftMultiCollisionFilename := filepath.Join(tmp, "leftMultiCollision.jwlibrary")
 	rightMultiCollisionFilename := filepath.Join(tmp, "rightMultiCollision.jwlibrary")
-	assert.NoError(t, emptyDB.ExportJWLBackup(emptyFilename))
-	assert.NoError(t, leftDB.ExportJWLBackup(leftFilename))
-	assert.NoError(t, rightDB.ExportJWLBackup(rightFilename))
-	assert.NoError(t, leftMultiCollision.ExportJWLBackup(leftMultiCollisionFilename))
-	assert.NoError(t, rightMultiCollision.ExportJWLBackup(rightMultiCollisionFilename))
+	assert.NoError(t, storage.ExportJWLBackup(emptyDB, emptyFilename))
+	assert.NoError(t, storage.ExportJWLBackup(leftDB, leftFilename))
+	assert.NoError(t, storage.ExportJWLBackup(rightDB, rightFilename))
+	assert.NoError(t, storage.ExportJWLBackup(leftMultiCollision, leftMultiCollisionFilename))
+	assert.NoError(t, storage.ExportJWLBackup(rightMultiCollision, rightMultiCollisionFilename))
 
 	// Merge against empty DB and see if result is still the same
 	RunCmdTest(t,
@@ -48,8 +49,8 @@ func Test_merge(t *testing.T) {
 		func(t *testing.T, c *expect.Console) {
 			merge(leftFilename, emptyFilename, mergedFilename,
 				terminal.Stdio{In: c.Tty(), Out: c.Tty(), Err: c.Tty()})
-			merged := &model.Database{}
-			merged.ImportJWLBackup(mergedFilename)
+			merged, err := storage.ImportJWLBackup(mergedFilename)
+			assert.NoError(t, err)
 			assert.True(t, leftDB.Equals(merged))
 		})
 
@@ -73,8 +74,8 @@ func Test_merge(t *testing.T) {
 		func(t *testing.T, c *expect.Console) {
 			merge(leftFilename, rightFilename, mergedFilename,
 				terminal.Stdio{In: c.Tty(), Out: c.Tty(), Err: c.Tty()})
-			merged := &model.Database{}
-			merged.ImportJWLBackup(mergedFilename)
+			merged, err := storage.ImportJWLBackup(mergedFilename)
+			assert.NoError(t, err)
 			assert.True(t, mergedAllRightDB.Equals(merged))
 		})
 
@@ -98,8 +99,8 @@ func Test_merge(t *testing.T) {
 		func(t *testing.T, c *expect.Console) {
 			merge(leftFilename, rightFilename, mergedFilename,
 				terminal.Stdio{In: c.Tty(), Out: c.Tty(), Err: c.Tty()})
-			merged := &model.Database{}
-			merged.ImportJWLBackup(mergedFilename)
+			merged, err := storage.ImportJWLBackup(mergedFilename)
+			assert.NoError(t, err)
 			assert.True(t, mergedAllLeftDB.Equals(merged))
 		})
 
@@ -117,8 +118,8 @@ func Test_merge(t *testing.T) {
 			InputFieldResolver = "chooseRight"
 			merge(leftFilename, rightFilename, mergedFilename,
 				terminal.Stdio{In: c.Tty(), Out: c.Tty(), Err: c.Tty()})
-			merged := &model.Database{}
-			merged.ImportJWLBackup(mergedFilename)
+			merged, err := storage.ImportJWLBackup(mergedFilename)
+			assert.NoError(t, err)
 			assert.True(t, mergedAllRightDB.Equals(merged))
 		})
 
@@ -135,8 +136,8 @@ func Test_merge(t *testing.T) {
 				rightMultiCollisionFilename,
 				mergedFilename,
 				terminal.Stdio{In: c.Tty(), Out: c.Tty(), Err: c.Tty()})
-			merged := &model.Database{}
-			merged.ImportJWLBackup(mergedFilename)
+			merged, err := storage.ImportJWLBackup(mergedFilename)
+			assert.NoError(t, err)
 			assert.True(t, rightMultiCollision.Equals(merged))
 		})
 }

main.go

@@ -1,7 +1,20 @@
 package main
 
-import "github.com/AndreasSko/go-jwlm/cmd"
+import (
+	"log"
+	"os"
+	"runtime/pprof"
+
+	"github.com/AndreasSko/go-jwlm/cmd"
+)
 
 func main() {
+	f, err := os.Create("cpu.prof")
+	if err != nil {
+		log.Fatal(err)
+	}
+	pprof.StartCPUProfile(f)
+	defer pprof.StopCPUProfile()
+
 	cmd.Execute()
 }