coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-26 12:57:44 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

a little cleanup, ipfs 'works' for basic file adds and cats

Browse Source
This commit is contained in:
Jeromy 2014-08-29 17:22:40 -07:00
parent 691d1b36bb
commit c2cc4b1d70
8 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ipfs/add.go
View File

@ -2,6 +2,10 @@ package main
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"github.com/gonuts/flag"
"github.com/jbenet/commander"
core "github.com/jbenet/go-ipfs/core"
@ -9,9 +13,6 @@ import (
dag "github.com/jbenet/go-ipfs/merkledag"
u "github.com/jbenet/go-ipfs/util"
mh "github.com/jbenet/go-multihash"
"io/ioutil"
"os"
"path/filepath"
)
// Error indicating the max depth has been exceded.
@ -41,7 +42,7 @@ func addCmd(c *commander.Command, inp []string) error {
return nil
}
n, err := localNode()
n, err := localNode(false)
if err != nil {
return err
}

2
cmd/ipfs/cat.go
View File

@ -26,7 +26,7 @@ func catCmd(c *commander.Command, inp []string) error {
return nil
}
n, err := localNode()
n, err := localNode(false)
if err != nil {
return err
}

4
cmd/ipfs/ipfs.go
View File

@ -67,12 +67,12 @@ func main() {
return
}
func localNode() (*core.IpfsNode, error) {
func localNode(online bool) (*core.IpfsNode, error) {
//todo implement config file flag
cfg, err := config.Load("")
if err != nil {
return nil, err
}
return core.NewIpfsNode(cfg)
return core.NewIpfsNode(cfg, online)
}

2
cmd/ipfs/ls.go
View File

@ -27,7 +27,7 @@ func lsCmd(c *commander.Command, inp []string) error {
return nil
}
n, err := localNode()
n, err := localNode(false)
if err != nil {
return err
}

2
cmd/ipfs/mount_unix.go
View File

@ -31,7 +31,7 @@ func mountCmd(c *commander.Command, inp []string) error {
return nil
}
n, err := localNode()
n, err := localNode(true)
if err != nil {
return err
}

2
cmd/ipfs/refs.go
View File

@ -36,7 +36,7 @@ func refCmd(c *commander.Command, inp []string) error {
return nil
}
n, err := localNode()
n, err := localNode(false)
if err != nil {
return err
}

2
config/serialize.go
View File

@ -33,7 +33,7 @@ func WriteConfigFile(filename string, cfg interface{}) error {
// WriteFile writes the buffer at filename
func WriteFile(filename string, buf []byte) error {
err := os.MkdirAll(filepath.Dir(filename), 755)
err := os.MkdirAll(filepath.Dir(filename), 0775)
if err != nil {
return err
}

53
core/core.go
View File

@ -55,7 +55,7 @@ type IpfsNode struct {
}
// NewIpfsNode constructs a new IpfsNode based on the given config.
func NewIpfsNode(cfg *config.Config) (*IpfsNode, error) {
func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
if cfg == nil {
return nil, fmt.Errorf("configuration required")
}
@ -65,35 +65,38 @@ func NewIpfsNode(cfg *config.Config) (*IpfsNode, error) {
return nil, err
}
maddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/4001")
if err != nil {
return nil, err
}
local := &peer.Peer{
ID: peer.ID(cfg.Identity.PeerID),
Addresses: []*ma.Multiaddr{maddr},
}
if len(local.ID) == 0 {
mh, err := u.Hash([]byte("blah blah blah ID"))
var swap *bitswap.BitSwap
if online {
maddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/4001")
if err != nil {
return nil, err
}
local.ID = peer.ID(mh)
local := &peer.Peer{
ID: peer.ID(cfg.Identity.PeerID),
Addresses: []*ma.Multiaddr{maddr},
}
if len(local.ID) == 0 {
mh, err := u.Hash([]byte("blah blah blah ID"))
if err != nil {
return nil, err
}
local.ID = peer.ID(mh)
}
net := swarm.NewSwarm(local)
err = net.Listen()
if err != nil {
return nil, err
}
route := dht.NewDHT(local, net, d)
route.Start()
swap = bitswap.NewBitSwap(local, net, d, route)
}
net := swarm.NewSwarm(local)
err = net.Listen()
if err != nil {
return nil, err
}
route := dht.NewDHT(local, net, d)
route.Start()
swap := bitswap.NewBitSwap(local, net, d, route)
bs, err := bserv.NewBlockService(d, swap)
if err != nil {
return nil, err