Merge pull request #20 from Baipyrus/better-config-files

Config Directory With Examples Instead Of Single File

cmd/debug.go

@@ -10,7 +10,7 @@ var debugCmd = &cobra.Command{
 	Use:   "debug",
 	Short: "Output all parsed configurations for debugging",
 	Run: func(cmd *cobra.Command, args []string) {
-		proxy.Debug(cfgFile)
+		proxy.Debug(cfgPath)
 	},
 }
 

cmd/root.go

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	cfgFile string
+	cfgPath string
 
 	// rootCmd represents the base command when called without any subcommands
 	rootCmd = &cobra.Command{
@@ -33,7 +33,7 @@ func init() {
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
 
-	rootCmd.PersistentFlags().StringVarP(&cfgFile, "configs", "c", "configs.json", "configurations file")
+	rootCmd.PersistentFlags().StringVarP(&cfgPath, "configs", "c", "configs/", "configurations path")
 
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.

cmd/save.go

@@ -37,8 +37,9 @@ var saveCmd = &cobra.Command{
 
 		var input string
 		fmt.Print("Save this data? (Y/n) ")
+		fmt.Scanln(&input)
 		if input == "" || strings.ToLower(input) == "y" {
-			util.SaveConfig(cfgFile, config)
+			util.SaveConfig(cfgPath, config)
 		}
 	},
 }

cmd/set.go

@@ -10,7 +10,7 @@ var setCmd = &cobra.Command{
 	Use:   "set",
 	Short: "Enable the current internet proxy settings",
 	Run: func(cmd *cobra.Command, args []string) {
-		proxy.Set(cfgFile)
+		proxy.Set(cfgPath)
 	},
 }
 

cmd/unset.go

@@ -10,7 +10,7 @@ var unsetCmd = &cobra.Command{
 	Use:   "unset",
 	Short: "Disable the current internet proxy settings",
 	Run: func(cmd *cobra.Command, args []string) {
-		proxy.Unset(cfgFile)
+		proxy.Unset(cfgPath)
 	},
 }
 

configs.json

@@ -1,104 +0,0 @@
-[
-    {
-        "name": "env",
-        "cmd": "[System.Environment]::SetEnvironmentVariable('$PRSW_ARG', $PRSW_ARG, 'User')",
-        "set": [
-            {
-                "args": [
-                    "http_proxy"
-                ],
-                "surround": "\"",
-                "type": "variable"
-            }, {
-                "args": [
-                    "https_proxy"
-                ],
-                "surround": "\"",
-                "type": "variable"
-            }
-        ],
-        "unset": [
-            {
-                "args": [
-                    "http_proxy",
-                    "[NullString]::Value"
-                ],
-                "type": "variable"
-            }, {
-                "args": [
-                    "https_proxy",
-                    "[NullString]::Value"
-                ],
-                "type": "variable"
-            }
-        ]
-    }, {
-        "name": "git",
-        "set": [
-            {
-                "args": [
-                    "config",
-                    "--global",
-                    "http.proxy"
-                ]
-            }, {
-                "args": [
-                    "config",
-                    "--global",
-                    "https.proxy"
-                ]
-            }
-        ],
-        "unset": [
-            {
-                "args": [
-                    "config",
-                    "--global",
-                    "--unset",
-                    "http.proxy"
-                ]
-            }, {
-                "args": [
-                    "config",
-                    "--global",
-                    "--unset",
-                    "https.proxy"
-                ]
-            }
-        ]
-    }, {
-        "name": "npm",
-        "set": [
-            {
-                "args": [
-                    "config",
-                    "set",
-                    "proxy"
-                ],
-                "equator": "="
-            }, {
-                "args": [
-                    "config",
-                    "set",
-                    "https-proxy"
-                ],
-                "equator": "="
-            }
-        ],
-        "unset": [
-            {
-                "args": [
-                    "config",
-                    "delete",
-                    "proxy"
-                ]
-            }, {
-                "args": [
-                    "config",
-                    "delete",
-                    "https-proxy"
-                ]
-            }
-        ]
-    }
-]

configs/env.json

@@ -0,0 +1,34 @@
+{
+    "name": "env",
+    "cmd": "[System.Environment]::SetEnvironmentVariable('$PRSW_ARG', $PRSW_ARG, 'User')",
+    "set": [
+        {
+            "args": [
+                "http_proxy"
+            ],
+            "surround": "\"",
+            "type": "variable"
+        }, {
+            "args": [
+                "https_proxy"
+            ],
+            "surround": "\"",
+            "type": "variable"
+        }
+    ],
+    "unset": [
+        {
+            "args": [
+                "http_proxy",
+                "[NullString]::Value"
+            ],
+            "type": "variable"
+        }, {
+            "args": [
+                "https_proxy",
+                "[NullString]::Value"
+            ],
+            "type": "variable"
+        }
+    ]
+}

configs/git.json

@@ -0,0 +1,35 @@
+{
+    "name": "git",
+    "set": [
+        {
+            "args": [
+                "config",
+                "--global",
+                "http.proxy"
+            ]
+        }, {
+            "args": [
+                "config",
+                "--global",
+                "https.proxy"
+            ]
+        }
+    ],
+    "unset": [
+        {
+            "args": [
+                "config",
+                "--global",
+                "--unset",
+                "http.proxy"
+            ]
+        }, {
+            "args": [
+                "config",
+                "--global",
+                "--unset",
+                "https.proxy"
+            ]
+        }
+    ]
+}

configs/npm.json

@@ -0,0 +1,35 @@
+{
+    "name": "npm",
+    "set": [
+        {
+            "args": [
+                "config",
+                "set",
+                "proxy"
+            ],
+            "equator": "="
+        }, {
+            "args": [
+                "config",
+                "set",
+                "https-proxy"
+            ],
+            "equator": "="
+        }
+    ],
+    "unset": [
+        {
+            "args": [
+                "config",
+                "delete",
+                "proxy"
+            ]
+        }, {
+            "args": [
+                "config",
+                "delete",
+                "https-proxy"
+            ]
+        }
+    ]
+}

configs/pip.json

@@ -0,0 +1,21 @@
+{
+    "name": "pip",
+    "set": [
+        {
+            "args": [
+                "config",
+                "set",
+                "global.proxy"
+            ]
+        }
+    ],
+    "unset": [
+        {
+            "args": [
+                "config",
+                "unset",
+                "global.proxy"
+            ]
+        }
+    ]
+}

configs/socks.example.json

@@ -0,0 +1,21 @@
+{
+    "name": "SOCKS",
+    "cmd": "[void] 'Toggle SOCKS v5'; $PRSW_ARG",
+    "set": [
+        {
+            "args": [
+                "Start-Process -FilePath 'cmd.exe' -ArgumentList '/c', 'start', 'ssh', '-D', 'PORT', '-q', '-C', '-N', '-f', 'HOST'"
+            ],
+            "type": "variable",
+            "discard": true
+        }
+    ],
+    "unset": [
+        {
+            "args": [
+                "TASKKILL /F /PID ((Get-NetTCPConnection -LocalPort 1337).OwningProcess | Select -First 1)"
+            ],
+            "type": "variable"
+        }
+    ]
+}

proxy/debug.go

@@ -22,8 +22,8 @@ func mapCmdsToStr(commands []*util.Command) string {
 	return strings.Join(output, "\n")
 }
 
-func Debug(cfgFile string) {
+func Debug(cfgPath string) {
-	path, _ := filepath.Abs(cfgFile)
+	path, _ := filepath.Abs(cfgPath)
 	if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
 		path = "[N/A]"
 	}
@@ -41,7 +41,7 @@ func Debug(cfgFile string) {
 	fmt.Printf("Enabled: %t\n", proxy.Enabled)
 	fmt.Printf("Server: %s\n\n", proxyServer)
 
-	configs, _ := util.ReadConfigs(cfgFile)
+	configs, _ := util.ReadConfigs(cfgPath)
 	for _, config := range configs {
 		configCmd := config.Name
 		// Use command instead of name, if given

proxy/set.go

@@ -4,7 +4,7 @@ import (
 	"github.com/Baipyrus/ProxySwitcher/util"
 )
 
-func Set(cfgFile string) {
+func Set(cfgPath string) {
 	stdin, closeFunc, _ := util.ReadyCmd()
 
 	proxy, _ := ReadSystemProxy()
@@ -13,7 +13,7 @@ func Set(cfgFile string) {
 		SetSystemProxy(true)
 	}
 
-	configs, _ := util.ReadConfigs(cfgFile)
+	configs, _ := util.ReadConfigs(cfgPath)
 	for _, config := range configs {
 		configCmd := config.Name
 		// Use command instead of name, if given

proxy/unset.go

@@ -4,7 +4,7 @@ import (
 	"github.com/Baipyrus/ProxySwitcher/util"
 )
 
-func Unset(cfgFile string) {
+func Unset(cfgPath string) {
 	stdin, closeFunc, _ := util.ReadyCmd()
 
 	proxy, _ := ReadSystemProxy()
@@ -13,7 +13,7 @@ func Unset(cfgFile string) {
 		SetSystemProxy(false)
 	}
 
-	configs, _ := util.ReadConfigs(cfgFile)
+	configs, _ := util.ReadConfigs(cfgPath)
 	for _, config := range configs {
 		configCmd := config.Name
 		// Use command instead of name, if given

util/config.go

@@ -2,38 +2,60 @@ package util
 
 import (
 	"encoding/json"
+	"fmt"
+	"io/fs"
+	"path/filepath"
+	"strings"
+
 	"io"
 	"os"
 )
 
-func ReadConfigs(name string) ([]*Config, error) {
+func ReadConfigs(cfgPath string) ([]*Config, error) {
-	file, err := os.Open(name)
+	var configs []*Config
 
-	if err != nil {
+	err := filepath.Walk(cfgPath, func(path string, info fs.FileInfo, err error) error {
-		return nil, err
+		name := info.Name()
-	}
+		isExample := strings.HasSuffix(name, ".example.json")
-	defer file.Close()
+		notJson := !strings.HasSuffix(name, ".json")
+		if info.IsDir() || isExample || notJson {
+			return nil
+		}
 
-	bytes, _ := io.ReadAll(file)
+		file, err := os.Open(path)
 
-	var config []*Config
+		if err != nil {
-	err = json.Unmarshal(bytes, &config)
+			return nil
+		}
+		defer file.Close()
 
-	if err != nil {
+		bytes, err := io.ReadAll(file)
-		return nil, err
+		if err != nil {
-	}
+			return nil
-	return config, nil
+		}
+
+		var config *Config
+		err = json.Unmarshal(bytes, &config)
+
+		if err != nil {
+			return nil
+		}
+
+		configs = append(configs, config)
+		return nil
+	})
+
+	return configs, err
 }
 
-func SaveConfig(name string, config Config) error {
+func SaveConfig(cfgPath string, config Config) error {
-	configs, _ := ReadConfigs(name)
+	data, err := json.Marshal(config)
-	configs = append(configs, &config)
-
-	data, err := json.Marshal(configs)
 	if err != nil {
 		return err
 	}
 
-	err = os.WriteFile(name, data, 0666)
+	cfgName := fmt.Sprintf("%s.json", config.Name)
+	cfgFile := filepath.Join(cfgPath, cfgName)
+	err = os.WriteFile(cfgFile, data, 0666)
 	return err
 }