mirror of
https://github.com/Baipyrus/ProxySwitcher.git
synced 2024-12-26 12:41:45 +00:00
rename 'applyProxy' to better describe applications of proxy server string
This commit is contained in:
parent
7fb9456492
commit
06637360d6
@ -26,7 +26,7 @@ func processVars(replaceVariable bool, args []string, configCmd string) ([]strin
|
|||||||
return configArgs, configCmd
|
return configArgs, configCmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyProxy(configArgs []string, configCmd, proxyServer string, variant *util.Variant) ([]string, string) {
|
func injectProxy(configArgs []string, configCmd, proxyServer string, variant *util.Variant) ([]string, string) {
|
||||||
// Skip, no proxy provided or proxy option discarded
|
// Skip, no proxy provided or proxy option discarded
|
||||||
if proxyServer == "" || variant.DiscardProxy {
|
if proxyServer == "" || variant.DiscardProxy {
|
||||||
return configArgs, configCmd
|
return configArgs, configCmd
|
||||||
@ -63,7 +63,7 @@ func generateCommands(variants []*util.Variant, configCmd, proxyServer string) [
|
|||||||
replaceVariable := variant.Type == util.VARIABLE
|
replaceVariable := variant.Type == util.VARIABLE
|
||||||
|
|
||||||
configArgs, configCmd := processVars(replaceVariable, variant.Arguments, configCmd)
|
configArgs, configCmd := processVars(replaceVariable, variant.Arguments, configCmd)
|
||||||
configArgs, configCmd = applyProxy(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})
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user