cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from ipfs/pin-ls-recursive

Browse Source 
Use "pin ls --type=recursive $pin" when checking if a pin exists
This commit is contained in:
Hector Sanjuan 2017-03-21 14:05:58 +01:00 committed by GitHub
commit 98043ca675
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipfsconn/ipfshttp/ipfshttp.go
View File

@ -431,10 +431,10 @@ func (ipfs *Connector) PinLs(typeFilter string) (map[string]api.IPFSPinStatus, e
return statusMap, nil
}
// PinLsCid performs a "pin ls <hash> "request and returns IPFSPinStatus for
// that hash.
// PinLsCid performs a "pin ls --type=recursive <hash> "request and returns
// an api.IPFSPinStatus for that hash.
func (ipfs *Connector) PinLsCid(hash *cid.Cid) (api.IPFSPinStatus, error) {
lsPath := fmt.Sprintf("pin/ls?arg=%s", hash)
lsPath := fmt.Sprintf("pin/ls?arg=%s&type=recursive", hash)
body, err := ipfs.get(lsPath)
// Network error, daemon down

1
pintracker/maptracker/maptracker.go
View File

@ -224,6 +224,7 @@ func (mpt *MapPinTracker) pin(c api.Pin) error {
func (mpt *MapPinTracker) unpin(c api.Pin) error {
logger.Debugf("issuing unpin call for %s", c.Cid)
mpt.set(c.Cid, api.TrackerStatusUnpinning)
err := mpt.rpcClient.Call("",
"Cluster",
"IPFSUnpin",

4
pintracker/maptracker/maptracker_test.go
View File

@ -108,6 +108,8 @@ func TestUntrack(t *testing.T) {
t.Fatal(err)
}
time.Sleep(time.Second / 2)
err = mpt.Untrack(h2)
if err != nil {
t.Fatal(err)
@ -121,7 +123,7 @@ func TestUntrack(t *testing.T) {
t.Fatal(err)
}
time.Sleep(400 * time.Millisecond)
time.Sleep(time.Second / 2)
st := mpt.Status(h1)
if st.Status != api.TrackerStatusUnpinned {