Merge pull request #436 from Laevos/fix/indirectpinstatus

fix #428: Use a regexp to match for indirect status in IPFSPinStatusF…

api/types.go

@@ -10,6 +10,7 @@ package api
 
 import (
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -103,10 +104,12 @@ type IPFSPinStatus int
 // IPFSPinStatusFromString parses a string and returns the matching
 // IPFSPinStatus.
 func IPFSPinStatusFromString(t string) IPFSPinStatus {
+	// Since indirect statuses are of the form "indirect through <cid>", use a regexp to match
+	var ind, _ = regexp.MatchString("^indirect", t)
 	// TODO: This is only used in the http_connector to parse
 	// ipfs-daemon-returned values. Maybe it should be extended.
 	switch {
-	case t == "indirect":
+	case ind:
 		return IPFSPinStatusIndirect
 	case t == "direct":
 		return IPFSPinStatusDirect