show: better print

cli/print.go

···
 	"log"
 	"os"
 
+	"github.com/atscan/atr/repo"
 	jsoniter "github.com/json-iterator/go"
 )
 
-func Print(v interface{}) error {
+type ObjectOutput struct {
+	Did   string      `json:"did"`
+	Rkey  string      `json:"rkey"`
+	Cid   string      `json:"cid"`
+	Body  interface{} `json:"body"`
+	Match interface{} `json:"-"`
+}
+
+func Print(v interface{}, ri repo.RepoItem, rs repo.RepoSnapshot) error {
+
 	json, err := jsoniter.Marshal(v)
 	if err != nil {
 		log.Fatal(err)
···
 	return nil
 }
 
-func PrettyPrint(v interface{}, hg func(io.Writer, string)) error {
+func PrettyPrint(v interface{}, ri repo.RepoItem, rs repo.RepoSnapshot, hg func(io.Writer, string)) error {
+
 	json, err := jsoniter.MarshalIndent(v, "", "  ")
 	if err != nil {
 		log.Fatal(err)

cmd/atr-show.go

···
 						continue
 					}
 				}
-				var out interface{}
+
+				out := cli.ObjectOutput{Did: ss.Repo.SignedCommit().Did, Cid: e.Cid.String(), Rkey: e.Path, Body: e.Body}
+
 				if q != "" || qq != "" {
-					json, err := jsoniter.Marshal(e.Body)
+					json, err := jsoniter.Marshal(out)
 					if err != nil {
 						log.Fatal("jsoniter error:", err)
 						continue
···
 							if v == nil {
 								continue
 							}
-							out = v
+							out.Match = v
 						}
 					}
 					if qq != "" {
···
 						if err != nil {
 							log.Fatalln("jmespath error:", err)
 						}
-						out = r
+						out.Match = r
 					}
+				}
+
+				var ro interface{}
+				if out.Match != nil {
+					ro = out.Match
 				} else {
-					out = e.Body
+					ro = out
 				}
+
 				stat, _ := os.Stdout.Stat()
 				if !Raw && (stat.Mode()&os.ModeCharDevice) != 0 {
-					cli.PrettyPrint(out, hg)
+					cli.PrettyPrint(ro, e, ss, hg)
 				} else {
-					cli.Print(out)
+					cli.Print(ro, e, ss)
 				}
 			}
 		}