Skip to content

refactoring naming conventions #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whyrusleeping merged 3 commits into from
Sep 10, 2014
Merged

refactoring naming conventions #37

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f7856a
refactoring naming conventions
llSourcell Sep 10, 2014
07bfa3b
fixed uppercase
llSourcell Sep 10, 2014
80dc4b3
gofmt-d and golint-d
llSourcell Sep 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed uppercase
  • Loading branch information
@llSourcell
llSourcell committed Sep 10, 2014
commit 07bfa3baf27d0c13f574dc5c3198440a816b9d97
20 changes: 10 additions & 10 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ type Command struct {
Opts map[string]interface{}
}

func NewDaemonListener(Ipfsnode *core.IpfsNode, addr string) (*DaemonListener, error) {
func NewDaemonListener(ipfsnode *core.IpfsNode, addr string) (*DaemonListener, error) {
list, err := net.Listen("tcp", addr)
if err != nil {
return nil, err
}
fmt.Println("New daemon listener initialized.")

return &DaemonListener{
node: Ipfsnode,
node: ipfsnode,
list: list,
}, nil
}
Expand Down Expand Up @@ -77,7 +77,7 @@ func (dl *DaemonListener) handleConnection(conn net.Conn) {
ExecuteCommand(&command, dl.node, conn)
}

func ExecuteCommand(com *Command, Ipfsnode *core.IpfsNode, out io.Writer) {
func ExecuteCommand(com *Command, ipfsnode *core.IpfsNode, out io.Writer) {
u.DOut("executing command: %s\n", com.Command)
switch com.Command {
case "add":
Expand All @@ -86,21 +86,21 @@ func ExecuteCommand(com *Command, Ipfsnode *core.IpfsNode, out io.Writer) {
depth = -1
}
for _, path := range com.Args {
_, err := commands.AddPath(Ipfsnode, path, depth)
_, err := commands.AddPath(ipfsnode, path, depth)
if err != nil {
fmt.Fprintf(out, "addFile error: %v\n", err)
continue
}
}
case "cat":
for _, fn := range com.Args {
DAGnode, err := Ipfsnode.Resolver.ResolvePath(fn)
dagnode, err := ipfsnode.Resolver.ResolvePath(fn)
if err != nil {
fmt.Fprintf(out, "catFile error: %v\n", err)
return
}

read, err := dag.NewDagReader(nd, Ipfsnode.DAG)
read, err := dag.NewDagReader(dagnode, ipfsnode.DAG)
if err != nil {
fmt.Fprintln(out, err)
continue
Expand All @@ -114,25 +114,25 @@ func ExecuteCommand(com *Command, Ipfsnode *core.IpfsNode, out io.Writer) {
}
case "ls":
for _, fn := range com.Args {
DAGnode, err := n.Resolver.ResolvePath(fn)
dagnode, err := ipfsnode.Resolver.ResolvePath(fn)
if err != nil {
fmt.Fprintf(out, "ls error: %v\n", err)
return
}

for _, link := range nd.Links {
for _, link := range dagnode.Links {
fmt.Fprintf(out, "%s %d %s\n", link.Hash.B58String(), link.Size, link.Name)
}
}
case "pin":
for _, fn := range com.Args {
DAGnode, err := Ipfsnode.Resolver.ResolvePath(fn)
dagnode, err := ipfsnode.Resolver.ResolvePath(fn)
if err != nil {
fmt.Fprintf(out, "pin error: %v\n", err)
return
}

err = Ipfsnode.PinDagNode(nd)
err = ipfsnode.PinDagNode(dagnode)
if err != nil {
fmt.Fprintf(out, "pin: %v\n", err)
return
Expand Down