Merge pull request #101 from ipfs/fix/resolve

magik6k · web-flow · commit c92b18bfebaa · 2018-07-10T11:14:06.000+02:00
Switch ResolvePath to use /resolve
diff --git a/shell.go b/shell.go
@@ -583,7 +583,7 @@ func (s *Shell) NewObject(template string) (string, error) {
 }
 
 func (s *Shell) ResolvePath(path string) (string, error) {
-	resp, err := s.newRequest(context.Background(), "object/stat", path).Send(s.httpcli)
+	resp, err := s.newRequest(context.Background(), "resolve", path).Send(s.httpcli)
 	if err != nil {
 		return "", err
 	}
@@ -593,13 +593,17 @@ func (s *Shell) ResolvePath(path string) (string, error) {
 		return "", resp.Error
 	}
 
-	var out object
+	var out struct {
+		Path string
+	}
 	err = json.NewDecoder(resp.Output).Decode(&out)
 	if err != nil {
 		return "", err
 	}
 
-	return out.Hash, nil
+	p := strings.TrimPrefix(out.Path, "/ipfs/")
+
+	return p, nil
 }
 
 // returns ipfs version and commit sha

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ func (s *Shell) NewObject(template string) (string, error) {`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`func (s *Shell) ResolvePath(path string) (string, error) {`
`586`		`- resp, err := s.newRequest(context.Background(), "object/stat", path).Send(s.httpcli)`
	`586`	`+ resp, err := s.newRequest(context.Background(), "resolve", path).Send(s.httpcli)`
`587`	`587`	`if err != nil {`
`588`	`588`	`return "", err`
`589`	`589`	`}`
`@@ -593,13 +593,17 @@ func (s *Shell) ResolvePath(path string) (string, error) {`
`593`	`593`	`return "", resp.Error`
`594`	`594`	`}`
`595`	`595`
`596`		`- var out object`
	`596`	`+ var out struct {`
	`597`	`+ Path string`
	`598`	`+ }`
`597`	`599`	`err = json.NewDecoder(resp.Output).Decode(&out)`
`598`	`600`	`if err != nil {`
`599`	`601`	`return "", err`
`600`	`602`	`}`
`601`	`603`
`602`		`- return out.Hash, nil`
	`604`	`+ p := strings.TrimPrefix(out.Path, "/ipfs/")`
	`605`	`+`
	`606`	`+ return p, nil`
`603`	`607`	`}`
`604`	`608`
`605`	`609`	`// returns ipfs version and commit sha`