fix: cleanup output of export & dataset commands

qri-io · Jan 31, 2018 · 4cf18a0 · 4cf18a0
1 parent 3bce325
commit 4cf18a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/cmd/export.go b/cmd/export.go
@@ -154,7 +154,7 @@ To export everything about a dataset, use the --dataset flag.`,
 
 			err = dst.Close()
 			ExitIfErr(err)
-			printSuccess("exported dataset data to: %s", dataPath)
+			printSuccess("exported data to: %s", dataPath)
 		}
 
 		if exportCmdDataset {
@@ -164,7 +164,7 @@ To export everything about a dataset, use the --dataset flag.`,
 			err = ioutil.WriteFile(dsPath, dsbytes, os.ModePerm)
 			ExitIfErr(err)
 
-			printSuccess("exported dataset dataset to: %s", dsPath)
+			printSuccess("exported dataset.json to: %s", dsPath)
 		}
 
 		// err = dsutil.WriteDir(r.Store(), ds, path)

diff --git a/cmd/setup.go b/cmd/setup.go
@@ -51,7 +51,7 @@ overwrite this info.`,
 			// this is usually a terrible idea
 			ErrExit(fmt.Errorf("repo already initialized"))
 		}
-		fmt.Println("setting up qri repo at: %s", QriRepoPath)
+		fmt.Printf("setting up qri repo at: %s\n", QriRepoPath)
 
 		envVars := map[string]*string{
 			"QRI_SETUP_CONFIG_DATA":  &setupConfigData,

diff --git a/core/datasets.go b/core/datasets.go
@@ -231,19 +231,6 @@ func (r *DatasetRequests) Init(p *InitParams, res *repo.DatasetRef) error {
 	if err != nil {
 		return fmt.Errorf("error reading file: %s", err.Error())
 	}
-	// Ensure that dataset is well-formed
-	// format, err := detect.ExtensionDataFormat(filename)
-	// if err != nil {
-	// 	return fmt.Errorf("error detecting format extension: %s", err.Error())
-	// }
-	// if err = validate.DataFormat(format, bytes.NewReader(data)); err != nil {
-	// 	return fmt.Errorf("invalid data format: %s", err.Error())
-	// }
-
-	// TODO - finish
-	// if p.Structure != nil {
-	// 	stData, err := ioutil.ReadAll(p.Structure)
-	// }
 
 	st, err := detect.FromReader(filename, bytes.NewReader(data))
 	if err != nil {
@@ -292,14 +279,18 @@ func (r *DatasetRequests) Init(p *InitParams, res *repo.DatasetRef) error {
 		ds.Meta.AccrualPeriodicity = "R/P1W"
 	}
 	if p.Metadata != nil {
-		if err := json.NewDecoder(p.Metadata).Decode(ds); err != nil {
+		if ds.Meta == nil {
+			ds.Meta = &dataset.Meta{}
+		}
+		if err := json.NewDecoder(p.Metadata).Decode(ds.Meta); err != nil {
 			return fmt.Errorf("error parsing metadata json: %s", err.Error())
 		}
 	}
 
 	dataf := memfs.NewMemfileBytes("data."+st.Format.String(), data)
 	dskey, err := r.repo.CreateDataset(ds, dataf, true)
 	if err != nil {
+		fmt.Printf("error creating dataset: %s\n", err.Error())
 		return err
 	}