Skip to content

Commit

Permalink
fix(save): ensure transforms are run when importing a zip
Browse files Browse the repository at this point in the history
  • Loading branch information
b5 committed Nov 4, 2018
1 parent 00a30d3 commit a35523c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
10 changes: 9 additions & 1 deletion actions/dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,19 @@ func DeleteDataset(node *p2p.QriNode, ref *repo.DatasetRef) (err error) {
return fmt.Errorf("given path does not equal most recent dataset path: cannot delete a specific save, can only delete entire dataset history. use `me/dataset_name` to delete entire dataset")
}

// ds, err := dsfs.LoadDataset(r.Store(), datastore.NewKey(ref.Path))
// TODO - this is causing bad things in our tests
// log, err := base.DatasetLog(r, *ref, 10000, 0, false)
// if err != nil {
// return err
// }

// for _, ref := range log {
// time.Sleep(time.Millisecond * 50)
// if err = base.UnpinDataset(r, ref); err != nil {
// return err
// }
// }

if err = r.DeleteRef(*ref); err != nil {
return err
}
Expand Down
4 changes: 1 addition & 3 deletions api/datasets.go
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,10 @@ func (h *DatasetHandlers) saveHandler(w http.ResponseWriter, r *http.Request) {
}
}
} else {
cleanup, err := dsutil.FormFileDataset(r, dsp)
if err != nil {
if err := dsutil.FormFileDataset(r, dsp); err != nil {
util.WriteErrResponse(w, http.StatusBadRequest, err)
return
}
defer cleanup()
}

res := &repo.DatasetRef{}
Expand Down
7 changes: 0 additions & 7 deletions base/dataset_prepare.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,8 @@ func PrepareDatasetNew(dsp *dataset.DatasetPod) (ds *dataset.Dataset, body cafs.
return
}

// NOTE - if we have a data file, this overrides any transformation,
// so we need to remove the transform to avoid having the data appear to be
// the result of a transform process
ds.Transform = nil

} else if err.Error() == "not found" {
err = nil
} else {
return
}

return
Expand Down

0 comments on commit a35523c

Please sign in to comment.