Skip to content

Commit 90719a8

Browse files
committed
feat(cmd/get): add rendered to selector in qri get command
1 parent 081cc79 commit 90719a8

File tree

5 files changed

+18
-1
lines changed

5 files changed

+18
-1
lines changed

base/dataset.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ func OpenDataset(fsys qfs.Filesystem, ds *dataset.Dataset) (err error) {
4040
return
4141
}
4242
}
43+
if ds.Viz != nil && ds.Viz.RenderedFile() == nil {
44+
if err = ds.Viz.OpenRenderedFile(fsys); err != nil {
45+
return
46+
}
47+
}
4348
return
4449
}
4550

@@ -60,6 +65,11 @@ func CloseDataset(ds *dataset.Dataset) (err error) {
6065
return
6166
}
6267
}
68+
if ds.Viz != nil && ds.Viz.RenderedFile() != nil {
69+
if err = ds.Viz.RenderedFile().Close(); err != nil {
70+
return
71+
}
72+
}
6373

6474
return
6575
}

cmd/get.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type GetOptions struct {
7373
}
7474

7575
// isDatasetField checks if a string is a dataset field or not
76-
var isDatasetField = regexp.MustCompile("(?i)^(commit|cm|structure|st|body|bd|meta|md|viz|vz|transform|tf)($|\\.)")
76+
var isDatasetField = regexp.MustCompile("(?i)^(commit|cm|structure|st|body|bd|meta|md|viz|vz|transform|tf|rendered|rd)($|\\.)")
7777

7878
// Complete adds any missing configuration that can only be added just before calling Run
7979
func (o *GetOptions) Complete(f Factory, args []string) (err error) {

lib/datasets.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ func (r *DatasetRequests) Get(p *GetParams, res *GetResult) (err error) {
155155
// `qri get viz.script` loads the visualization script, as a special case
156156
res.Bytes, err = ioutil.ReadAll(ds.Viz.ScriptFile())
157157
return err
158+
} else if p.Selector == "rendered" && ds.Viz != nil && ds.Viz.RenderedFile() != nil {
159+
// `qri get rendered` loads the rendered visualization script, as a special case
160+
res.Bytes, err = ioutil.ReadAll(ds.Viz.RenderedFile())
161+
return err
158162
} else {
159163
var value interface{}
160164
if p.Selector == "" {

rev/rev.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ var fieldMap = map[string]string{
6666
"transform": "tf",
6767
"structure": "st",
6868
"body": "bd",
69+
"rendered": "rd",
6970

7071
"ds": "ds",
7172
"md": "md",
7273
"vz": "vz",
7374
"tf": "tf",
7475
"st": "st",
7576
"bd": "bd",
77+
"rd": "rd",
7678
}

rev/rev_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ func TestParseRevs(t *testing.T) {
1515
{"body", []*Rev{&Rev{"bd", 1}}, ""},
1616
{"md", []*Rev{&Rev{"md", 1}}, ""},
1717
{"ds", []*Rev{&Rev{"ds", 1}}, ""},
18+
{"rd", []*Rev{&Rev{"rd", 1}}, ""},
1819
{"1", []*Rev{&Rev{"ds", 1}}, ""},
1920
{"2", []*Rev{&Rev{"ds", 2}}, ""},
2021
{"3", []*Rev{&Rev{"ds", 3}}, ""},

0 commit comments

Comments
 (0)