Baipyrus/ProxySwitcher
1
0
Fork 0
mirror of https://github.com/Baipyrus/ProxySwitcher.git synced 2024-12-26 12:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify base signature of 'generateCommands' to avoid overused variables

Browse Source
This commit is contained in:
Baipyrus 2024-10-01 20:09:54 +02:00
parent 9eb5982bb7
commit 024535de6f
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/debug.go
View File

@ -51,12 +51,12 @@ func Debug(cfgPath string) {
fmt.Printf("Loading commands for '%s':\n", config.Name) fmt.Printf("Loading commands for '%s':\n", config.Name)
// Debug Proxy Set Commands // Debug Proxy Set Commands
setCmds := generateCommands(config.Set, configCmd, "[PROXY PLACEHOLDER]") setCmds := generateCommands(configCmd, config.Set, "[PROXY PLACEHOLDER]")
fmt.Println("Set Commands:") fmt.Println("Set Commands:")
fmt.Printf("%s\n", mapCmdsToStr(setCmds)) fmt.Printf("%s\n", mapCmdsToStr(setCmds))
// Debug Proxy Unset Commands // Debug Proxy Unset Commands
unsetCmds := generateCommands(config.Unset, configCmd, "") unsetCmds := generateCommands(configCmd, config.Unset, "")
fmt.Println("Unset Commands:") fmt.Println("Unset Commands:")
fmt.Printf("%s\n\n", mapCmdsToStr(unsetCmds)) fmt.Printf("%s\n\n", mapCmdsToStr(unsetCmds))
} }

2
proxy/set.go
View File

@ -21,7 +21,7 @@ func Set(cfgPath string) {
configCmd = config.Cmd configCmd = config.Cmd
} }
commands := generateCommands(config.Set, configCmd, proxy.Server) commands := generateCommands(configCmd, config.Set, proxy.Server)
util.ExecCmds(commands, stdin) util.ExecCmds(commands, stdin)
} }

2
proxy/unset.go
View File

@ -21,7 +21,7 @@ func Unset(cfgPath string) {
configCmd = config.Cmd configCmd = config.Cmd
} }
commands := generateCommands(config.Unset, configCmd, "") commands := generateCommands(configCmd, config.Unset, "")
util.ExecCmds(commands, stdin) util.ExecCmds(commands, stdin)
} }

12
proxy/util.go
View File

@ -55,14 +55,20 @@ func injectProxy(configArgs []string, configCmd, proxyServer string, variant *ut
return configArgs, configCmd return configArgs, configCmd
} }
func generateCommands(variants []*util.Variant, configCmd, proxyServer string) []*util.Command { func generateCommands(base string, variants []*util.Variant, proxyServer string) []*util.Command {
var commands []*util.Command var commands []*util.Command
// Generate one command per variant // Iterate through all variants and generate a command for each
for _, variant := range variants { for _, variant := range variants {
isVariableType := variant.Type == util.VARIABLE isVariableType := variant.Type == util.VARIABLE
configArgs, configCmd := processVars(isVariableType, variant.Arguments, configCmd) // Create command from default parameters
cmd := &util.Command{
Name: base,
Arguments: append([]string{}, variant.Arguments...),
}
configArgs, configCmd := processVars(isVariableType, cmd.Arguments, cmd.Name)
configArgs, configCmd = injectProxy(configArgs, configCmd, proxyServer, variant) configArgs, configCmd = injectProxy(configArgs, configCmd, proxyServer, variant)
commands = append(commands, &util.Command{Name: configCmd, Arguments: configArgs}) commands = append(commands, &util.Command{Name: configCmd, Arguments: configArgs})