提交 9ff238e8 作者: Jeromy

a little more cleanup

License: MIT
Signed-off-by: 's avatarJeromy <why@ipfs.io>
上级 c1425346
...@@ -304,14 +304,12 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi ...@@ -304,14 +304,12 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi
case cmds.ArgString: case cmds.ArgString:
if len(inputs) > 0 { if len(inputs) > 0 {
stringArgs, inputs = append(stringArgs, inputs[0]), inputs[1:] stringArgs, inputs = append(stringArgs, inputs[0]), inputs[1:]
} else { } else if stdin != nil && argDef.SupportsStdin && !fillingVariadic {
if stdin != nil && argDef.SupportsStdin && !fillingVariadic {
if err := printReadInfo(stdin, msgStdinInfo); err == nil { if err := printReadInfo(stdin, msgStdinInfo); err == nil {
fileArgs[stdin.Name()] = files.NewReaderFile("stdin", "", stdin, nil) fileArgs[stdin.Name()] = files.NewReaderFile("stdin", "", stdin, nil)
stdin = nil stdin = nil
} }
} }
}
case cmds.ArgFile: case cmds.ArgFile:
if len(inputs) > 0 { if len(inputs) > 0 {
// treat stringArg values as file paths // treat stringArg values as file paths
...@@ -332,17 +330,13 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi ...@@ -332,17 +330,13 @@ func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursi
} }
fileArgs[fpath] = file fileArgs[fpath] = file
} else { } else if stdin != nil && argDef.SupportsStdin &&
if stdin != nil && argDef.SupportsStdin &&
argDef.Required && !fillingVariadic { argDef.Required && !fillingVariadic {
if err := printReadInfo(stdin, msgStdinInfo); err != nil { if err := printReadInfo(stdin, msgStdinInfo); err != nil {
return nil, nil, err return nil, nil, err
} }
fpath := stdin.Name() fpath := stdin.Name()
fileArgs[fpath] = files.NewReaderFile("", fpath, stdin, nil) fileArgs[fpath] = files.NewReaderFile("", fpath, stdin, nil)
} else {
break
}
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论