feat(dagInfo): add ability to get a subDag at a specific label

added `lib.SubDAGInfo`, `lib.SubDAGParams`, `actions.NewSubDAGInfo`, `base.NewSubDAGInfo`
qri-io · Mar 15, 2019 · 7a07ee8 · 7a07ee8
1 parent e4d9e27
commit 7a07ee8
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 3 deletions.
diff --git a/actions/manifest.go b/actions/manifest.go
@@ -40,6 +40,16 @@ func NewDAGInfo(node *p2p.QriNode, path string) (*dag.Info, error) {
 	return base.NewDAGInfo(node.Context(), node.Repo.Store(), ng, path)
 }
 
+// NewSubDAGInfo generates a SubDAGInfo for a given node at a given label
+func NewSubDAGInfo(node *p2p.QriNode, path, label string) (*dag.Info, error) {
+	ng, err := newNodeGetter(node)
+	if err != nil {
+		return nil, err
+	}
+
+	return base.NewSubDAGInfo(node.Context(), node.Repo.Store(), ng, path, label)
+}
+
 // newNodeGetter generates an ipld.NodeGetter from a QriNode
 func newNodeGetter(node *p2p.QriNode) (ng ipld.NodeGetter, err error) {
 	ipfsn, err := node.IPFSNode()

diff --git a/base/manifest.go b/base/manifest.go
@@ -77,3 +77,12 @@ func NewDAGInfo(ctx context.Context, store cafs.Filestore, ng ipld.NodeGetter, p
 	}
 	return info, nil
 }
+
+// NewSubDAGInfo generates a SubDAGInfo for a given node at a given label
+func NewSubDAGInfo(ctx context.Context, store cafs.Filestore, ng ipld.NodeGetter, path, label string) (*dag.Info, error) {
+	info, err := NewDAGInfo(ctx, store, ng, path)
+	if err != nil {
+		return nil, err
+	}
+	return info.InfoAtLabel(label)
+}
diff --git a/cmd/DAGInfo.go b/cmd/DAGInfo.go
@@ -71,12 +71,19 @@ type DAGInfoOptions struct {
 	Pretty bool
 	Hex    bool
 	File   string
+	Label  string
 
 	DatasetRequests *lib.DatasetRequests
 }
 
 // Complete adds any missing configuration that can only be added just before calling Run
 func (o *DAGInfoOptions) Complete(f Factory, args []string) (err error) {
+	if len(args) > 0 {
+		if isDatasetField.MatchString(args[0]) {
+			o.Label = args[0]
+			args = args[1:]
+		}
+	}
 	o.Refs = args
 	o.DatasetRequests, err = f.DatasetRequests()
 	return
@@ -86,8 +93,15 @@ func (o *DAGInfoOptions) Complete(f Factory, args []string) (err error) {
 func (o *DAGInfoOptions) Get() (err error) {
 	info := &dag.Info{}
 	for _, refstr := range o.Refs {
-		if err = o.DatasetRequests.DAGInfo(&refstr, info); err != nil {
-			return err
+		if o.Label != "" {
+			s := &lib.SubDAGParams{RefStr: refstr, Label: o.Label}
+			if err = o.DatasetRequests.SubDAGInfo(s, info); err != nil {
+				return err
+			}
+		} else {
+			if err = o.DatasetRequests.DAGInfo(&refstr, info); err != nil {
+				return err
+			}
 		}
 
 		var buffer []byte

diff --git a/lib/datasets.go b/lib/datasets.go
@@ -626,7 +626,7 @@ func (r *DatasetRequests) ManifestMissing(a, b *dag.Manifest) (err error) {
 	return
 }
 
-// DAGInfo generates a manifest for a dataset path
+// DAGInfo generates a dag.Info for a dataset path
 func (r *DatasetRequests) DAGInfo(refstr *string, i *dag.Info) (err error) {
 	if r.cli != nil {
 		return r.cli.Call("DatasetRequests.DAGInfo", refstr, i)
@@ -648,3 +648,31 @@ func (r *DatasetRequests) DAGInfo(refstr *string, i *dag.Info) (err error) {
 	*i = *info
 	return
 }
+
+// SubDAGParams defines parameters for the SubDAGInfo method
+type SubDAGParams struct {
+	RefStr, Label string
+}
+
+// SubDAGInfo generates a dag.Info for a sub DAG at a label in the original dag.Info
+func (r *DatasetRequests) SubDAGInfo(s *SubDAGParams, i *dag.Info) error {
+	if r.cli != nil {
+		return r.cli.Call("DatasetRequests.SubDAGInfo", s, i)
+	}
+
+	ref, err := repo.ParseDatasetRef(s.RefStr)
+	if err != nil {
+		return err
+	}
+	if err = repo.CanonicalizeDatasetRef(r.node.Repo, &ref); err != nil {
+		return err
+	}
+
+	var info *dag.Info
+	info, err = actions.NewSubDAGInfo(r.node, ref.Path, s.Label)
+	if err != nil {
+		return err
+	}
+	*i = *info
+	return nil
+}