fix(Save): fix saving dataset with viz stored in cafs

I tried to update the cfl dataset, couldn't get it to work on account of the viz script trying to load from a filepath. This now seems like a set of consistent issues we should look into when working on the "file pattern refacter": * making sure we always load the right things from the right places * maintaining a consistent dataset state through the save process, with readers being loaded once, and that point in time forming an assumption other function calls can rely on
qri-io · Nov 14, 2018 · bc2b00a · bc2b00a
1 parent 0096995
commit bc2b00a
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 14 deletions.
diff --git a/base/dataset.go b/base/dataset.go
@@ -78,6 +78,12 @@ func CreateDataset(r repo.Repo, streams ioes.IOStreams, name string, ds *dataset
 		return
 	}
 
+	// TODO - we should remove the need for this by having viz always be kept in the right
+	// state until this point
+	if err = prepareViz(r, ds); err != nil {
+		return
+	}
+
 	// TODO - move dsfs.prepareDataset stuff up here into a "SetComputedValues" func
 
 	if err = ValidateDataset(name, ds); err != nil {

diff --git a/base/dataset_prepare.go b/base/dataset_prepare.go
@@ -84,10 +84,6 @@ func InferValues(pro *profile.Profile, name *string, ds *dataset.Dataset, body c
 		res = cafs.NewMemfileReader(body.FileName(), io.MultiReader(buf, body))
 	}
 
-	if err = prepareViz(ds); err != nil {
-		return
-	}
-
 	if ds.Transform != nil && ds.Transform.IsEmpty() {
 		ds.Transform = nil
 	}

diff --git a/base/viz.go b/base/viz.go
@@ -1,27 +1,39 @@
 package base
 
 import (
-	"bytes"
-	"io/ioutil"
+	"os"
+	"strings"
 
+	datastore "github.com/ipfs/go-datastore"
+	"github.com/qri-io/cafs"
 	"github.com/qri-io/dataset"
+	"github.com/qri-io/qri/repo"
 )
 
 // PrepareViz loads vizualization bytes from a local filepath
-func prepareViz(ds *dataset.Dataset) (err error) {
+func prepareViz(r repo.Repo, ds *dataset.Dataset) (err error) {
 	// remove any empty vizualizations
 	if ds.Viz != nil && ds.Viz.IsEmpty() {
 		ds.Viz = nil
 		return nil
 	}
 
 	if ds.Viz != nil && ds.Viz.ScriptPath != "" {
-		// create a reader of script bytes
-		scriptdata, err := ioutil.ReadFile(ds.Viz.ScriptPath)
-		if err != nil {
-			return err
+		if strings.HasPrefix(ds.Viz.ScriptPath, "/ipfs") || strings.HasPrefix(ds.Viz.ScriptPath, "/map") || strings.HasPrefix(ds.Viz.ScriptPath, "/cafs") {
+			var f cafs.File
+			f, err = r.Store().Get(datastore.NewKey(ds.Viz.ScriptPath))
+			if err != nil {
+				return
+			}
+			ds.Viz.Script = f
+		} else {
+			var f *os.File
+			f, err = os.Open(ds.Viz.ScriptPath)
+			if err != nil {
+				return
+			}
+			ds.Viz.Script = f
 		}
-		ds.Viz.Script = bytes.NewReader(scriptdata)
 	}
 	return nil
 }
diff --git a/base/viz_test.go b/base/viz_test.go
@@ -4,23 +4,43 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/qri-io/cafs"
+
 	"github.com/qri-io/dataset"
 )
 
 func TestPrepareViz(t *testing.T) {
+	r := newTestRepo(t)
+	tmpl := []byte(`<html><head><title>hallo</title></head></html>`)
+
 	f, err := ioutil.TempFile("", "viz")
 	if err != nil {
 		t.Fatal(err.Error())
 	}
-	f.Write([]byte(`<html><head><title>hallo</title></head></html>`))
+	f.Write(tmpl)
 
 	ds := &dataset.Dataset{
 		Viz: &dataset.Viz{
 			ScriptPath: f.Name(),
 		},
 	}
 
-	if err := prepareViz(ds); err != nil {
+	if err := prepareViz(r, ds); err != nil {
+		t.Error(err.Error())
+	}
+
+	key, err := r.Store().Put(cafs.NewMemfileBytes("tmpl.html", tmpl), true)
+	if err != nil {
+		t.Fatal(key)
+	}
+
+	ds = &dataset.Dataset{
+		Viz: &dataset.Viz{
+			ScriptPath: key.String(),
+		},
+	}
+
+	if err := prepareViz(r, ds); err != nil {
 		t.Error(err.Error())
 	}
 }