From 630b88d227fbbf3f0af9faa18af86b3666e6f833 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Tue, 4 Nov 2014 03:45:29 -0800
Subject: [PATCH] refactor(init) extract force flag
---
cmd/ipfs2/init.go | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/cmd/ipfs2/init.go b/cmd/ipfs2/init.go
index 2ea048301..5bb24fb16 100644
--- a/cmd/ipfs2/init.go
+++ b/cmd/ipfs2/init.go
@@ -29,13 +29,20 @@ var initCmd = &cmds.Command{
Run: func(res cmds.Response, req cmds.Request) {
arg, found := req.Option("d")
- dspath, ok := arg.(string) // TODO param
+ dspath, ok := arg.(string)
if found && !ok {
res.SetError(errors.New("failed to parse datastore flag"), cmds.ErrNormal)
return
}
- err := foo(res, req, dspath)
+ arg, found = req.Option("f")
+ force, ok := arg.(bool) // TODO param
+ if found && !ok {
+ res.SetError(errors.New("failed to parse force flag"), cmds.ErrNormal)
+ return
+ }
+
+ err := foo(res, req, dspath, force)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
@@ -43,7 +50,7 @@ var initCmd = &cmds.Command{
},
}
-func foo(res cmds.Response, req cmds.Request, dspath string) error {
+func foo(res cmds.Response, req cmds.Request, dspath string, force bool) error {
ctx := req.Context()
u.POut("initializing ipfs node at %s\n", ctx.ConfigRoot)
@@ -52,12 +59,6 @@ func foo(res cmds.Response, req cmds.Request, dspath string) error {
return errors.New("Couldn't get home directory path")
}
- arg, found := req.Option("f")
- force, ok := arg.(bool) // TODO param
- if found && !ok {
- return errors.New("failed to parse force flag")
- }
-
fi, err := os.Lstat(filename)
if fi != nil || (err != nil && !os.IsNotExist(err)) {
if !force {
--
GitLab