update UI from PR comments
Jeromy committed
Feb 4, 2015 at 21:01 UTC
2501a7c7b7091fef690092745b1c141b2a9331da
2 files changed
+21
-10
core/coreunix/metadata.go
+12
-5
@@ -7,8 +7,9 @@ import (
7
u "github.com/jbenet/go-ipfs/util"
8
)
9
10
-func AddMetadataTo(key u.Key, m *ft.Metadata, n *core.IpfsNode) (u.Key, error) {
11
- nd, err := n.DAG.Get(key)
10
+func AddMetadataTo(n *core.IpfsNode, key string, m *ft.Metadata) (string, error) {
11
+ ukey := u.B58KeyDecode(key)
12
+ nd, err := n.DAG.Get(ukey)
13
if err != nil {
14
return "", err
15
}
@@ -25,11 +26,17 @@ func AddMetadataTo(key u.Key, m *ft.Metadata, n *core.IpfsNode) (u.Key, error) {
26
return "", err
27
}
28
28
- return n.DAG.Add(mdnode)
29
+ nk, err := n.DAG.Add(mdnode)
30
+ if err != nil {
31
+ return "", err
32
+ }
33
+
34
+ return nk.B58String(), nil
35
}
36
31
-func Metadata(key u.Key, n *core.IpfsNode) (*ft.Metadata, error) {
32
- nd, err := n.DAG.Get(key)
37
+func Metadata(n *core.IpfsNode, key string) (*ft.Metadata, error) {
38
+ ukey := u.B58KeyDecode(key)
39
+ nd, err := n.DAG.Get(ukey)
40
if err != nil {
41
return nil, err
42
}
core/coreunix/metadata_test.go
+9
-5
@@ -10,6 +10,7 @@ import (
10
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
11
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
12
bserv "github.com/jbenet/go-ipfs/blockservice"
13
+ core "github.com/jbenet/go-ipfs/core"
14
offline "github.com/jbenet/go-ipfs/exchange/offline"
15
importer "github.com/jbenet/go-ipfs/importer"
16
chunk "github.com/jbenet/go-ipfs/importer/chunk"
@@ -19,7 +20,7 @@ import (
20
u "github.com/jbenet/go-ipfs/util"
21
)
22
22
-func getDagservAndPinner(t *testing.T) merkledag.DAGService {
23
+func getDagserv(t *testing.T) merkledag.DAGService {
24
db := dssync.MutexWrap(ds.NewMapDatastore())
25
bs := bstore.NewBlockstore(db)
26
blockserv, err := bserv.New(bs, offline.Exchange(bs))
@@ -31,7 +32,7 @@ func getDagservAndPinner(t *testing.T) merkledag.DAGService {
32
33
func TestMetadata(t *testing.T) {
34
// Make some random node
34
- ds := getDagservAndPinner(t)
35
+ ds := getDagserv(t)
36
data := make([]byte, 1000)
37
u.NewTimeSeededRand().Read(data)
38
r := bytes.NewReader(data)
@@ -48,12 +49,15 @@ func TestMetadata(t *testing.T) {
49
m := new(ft.Metadata)
50
m.MimeType = "THIS IS A TEST"
51
51
- mdk, err := AddMetadataTo(k, m, ds)
52
+ // Such effort, many compromise
53
+ ipfsnode := &core.IpfsNode{DAG: ds}
54
+
55
+ mdk, err := AddMetadataTo(ipfsnode, k.B58String(), m)
56
if err != nil {
57
t.Fatal(err)
58
}
59
56
- rec, err := Metadata(mdk, ds)
60
+ rec, err := Metadata(ipfsnode, mdk)
61
if err != nil {
62
t.Fatal(err)
63
}
@@ -61,7 +65,7 @@ func TestMetadata(t *testing.T) {
65
t.Fatalf("something went wrong in conversion: '%s' != '%s'", rec.MimeType, m.MimeType)
66
}
67
64
- retnode, err := ds.Get(mdk)
68
+ retnode, err := ds.Get(u.B58KeyDecode(mdk))
69
if err != nil {
70
t.Fatal(err)
71
}