Russtopia/xs
2
1
Fork 0
mirror of https://gogs.blitter.com/RLabs/xs synced 2024-08-14 10:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Improved 'fancy arg' parsing - gathering up otherArgs (non-flag) as path src list

Browse source
This commit is contained in:
Russ Magee 2018-07-29 12:47:44 -07:00
parent 5eb7d4d1e6
commit 55cf5a9277
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hkexsh/hkexsh.go
View file

@ -53,14 +53,14 @@ func GetSize() (cols, rows int, err error) {
return return
} }
func parseFancyEndpointArg(a []string, dp string) (user, host, port, path string) { func parseNonSwitchArgs(a []string, dp string) (user, host, port, path string, isDest bool, otherArgs []string) {
//TODO: Look for non-option fancyArg of syntax user@host:filespec to set -r,-t and -u //TODO: Look for non-option fancyArg of syntax user@host:filespec to set -r,-t and -u
// Consider: whether fancyArg is src or dst file depends on flag.Args() index; // Consider: whether fancyArg is src or dst file depends on flag.Args() index;
// fancyArg as last flag.Args() element denotes dstFile // fancyArg as last flag.Args() element denotes dstFile
// fancyArg as not-last flag.Args() element denotes srcFile // fancyArg as not-last flag.Args() element denotes srcFile
// * throw error if >1 fancyArgs are found in flags.Args() // * throw error if >1 fancyArgs are found in flags.Args()
var fancyUser, fancyHost, fancyPort, fancyPath string var fancyUser, fancyHost, fancyPort, fancyPath string
for i, arg := range flag.Args() { for i, arg := range a {
if strings.Contains(arg, ":") || strings.Contains(arg, "@") { if strings.Contains(arg, ":") || strings.Contains(arg, "@") {
fancyArg := strings.Split(flag.Arg(i), "@") fancyArg := strings.Split(flag.Arg(i), "@")
var fancyHostPortPath []string var fancyHostPortPath []string
@ -89,15 +89,20 @@ func parseFancyEndpointArg(a []string, dp string) (user, host, port, path string
fancyPort = dp fancyPort = dp
} }
if fancyPath == "" { //if fancyPath == "" {
fancyPath = "." // fancyPath = "."
} //}
fmt.Println("fancyArgs: user:", fancyUser, "host:", fancyHost, "port:", fancyPort, "path:", fancyPath) if i == len(a)-1 {
break // ignore multiple 'fancyArgs' isDest = true
fmt.Println("isDest")
}
//fmt.Println("fancyArgs: user:", fancyUser, "host:", fancyHost, "port:", fancyPort, "path:", fancyPath)
} else {
otherArgs = append(otherArgs, a[i])
} }
} }
return fancyUser, fancyHost, fancyPort, fancyPath return fancyUser, fancyHost, fancyPort, fancyPath, isDest, otherArgs
} }
// Demo of a simple client that dials up to a simple test server to // Demo of a simple client that dials up to a simple test server to
@ -160,21 +165,26 @@ func main() {
} }
flag.Parse() flag.Parse()
fancyUser, fancyHost, fancyPort, fancyPath := parseFancyEndpointArg(flag.Args(), defPort /* defPort */) fancyUser, fancyHost, fancyPort, fancyPath, pathIsDest, otherArgs :=
fmt.Println("fancyHost:", fancyHost) parseNonSwitchArgs(flag.Args(), defPort /* defPort */)
fmt.Println("otherArgs:", otherArgs)
//fmt.Println("fancyHost:", fancyHost)
if fancyUser != "" { if fancyUser != "" {
altUser = fancyUser altUser = fancyUser
} }
if fancyHost != "" { if fancyHost != "" {
server = fancyHost + ":" + fancyPort server = fancyHost + ":" + fancyPort
fmt.Println("fancyHost sets server to", server) //fmt.Println("fancyHost sets server to", server)
} }
if fancyPath != "" { if fancyPath != "" {
//TODO: srcPath or dstPath depends on other flag.Args if pathIsDest {
copyDst = fancyPath copyDst = fancyPath
} else {
copySrc = fancyPath
}
} }
fmt.Println("server finally is:", server) //fmt.Println("server finally is:", server)
if flag.NFlag() == 0 && server == "" { if flag.NFlag() == 0 && server == "" {
flag.Usage() flag.Usage()