|
@@ -226,8 +226,8 @@ func DownCommand(conn *websocket.Conn, hash, projectName, fileName, dir string) |
|
|
if errStdout != nil || errStderr != nil { |
|
|
if errStdout != nil || errStderr != nil { |
|
|
log.Printf("failed to capture stdout or stderr\n") |
|
|
log.Printf("failed to capture stdout or stderr\n") |
|
|
} |
|
|
} |
|
|
outStr, errStr := string(stdout), string(stderr) |
|
|
|
|
|
log.Printf("out:%s ,err:%s", outStr, errStr) |
|
|
|
|
|
|
|
|
outStr := string(stdout) |
|
|
|
|
|
log.Printf("out:%s", outStr) |
|
|
|
|
|
|
|
|
if err==nil{ |
|
|
if err==nil{ |
|
|
log.Println("下载成功") |
|
|
log.Println("下载成功") |
|
@@ -320,7 +320,6 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
|
|
|
|
|
|
var uploading bool=false |
|
|
var uploading bool=false |
|
|
|
|
|
|
|
|
log.Println("本地执行ipfs add") |
|
|
|
|
|
cmd := exec.Command(ipfsPath, "add",absolutePath) |
|
|
cmd := exec.Command(ipfsPath, "add",absolutePath) |
|
|
uploadProgress := make(chan string,10000) |
|
|
uploadProgress := make(chan string,10000) |
|
|
var stdout, stderr []byte |
|
|
var stdout, stderr []byte |
|
@@ -404,8 +403,8 @@ func UploadCommand(conn *websocket.Conn,absolutePath,fileName,projectName,dir st |
|
|
if errStdout != nil || errStderr != nil { |
|
|
if errStdout != nil || errStderr != nil { |
|
|
log.Println("failed to capture stdout or stderr\n") |
|
|
log.Println("failed to capture stdout or stderr\n") |
|
|
} |
|
|
} |
|
|
outStr, errStr := string(stdout), string(stderr) |
|
|
|
|
|
log.Printf("out:%s,err:%s", outStr, errStr) |
|
|
|
|
|
|
|
|
outStr := string(stdout) |
|
|
|
|
|
log.Printf("out:%s", outStr) |
|
|
/*sh.Get(hash,absoluteDir+fileName) |
|
|
/*sh.Get(hash,absoluteDir+fileName) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return "",err |
|
|
return "",err |
|
|