mirror of
https://github.com/router-for-me/CLIProxyAPIPlus.git
synced 2026-04-26 21:15:48 +00:00
refactor: replace custom stringContains with strings.Contains
- Remove custom stringContains and findSubstring helper functions - Use standard library strings.Contains for better maintainability - No functional change, just cleaner code Addresses Gemini Code Assist review feedback
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
pkgbrowser "github.com/pkg/browser"
|
pkgbrowser "github.com/pkg/browser"
|
||||||
@@ -208,22 +209,7 @@ func tryDefaultBrowserMacOS(url string) *exec.Cmd {
|
|||||||
|
|
||||||
// containsBrowserID checks if the LaunchServices output contains a browser ID.
|
// containsBrowserID checks if the LaunchServices output contains a browser ID.
|
||||||
func containsBrowserID(output, bundleID string) bool {
|
func containsBrowserID(output, bundleID string) bool {
|
||||||
return stringContains(output, bundleID)
|
return strings.Contains(output, bundleID)
|
||||||
}
|
|
||||||
|
|
||||||
// stringContains is a simple string contains check.
|
|
||||||
func stringContains(s, substr string) bool {
|
|
||||||
return len(s) >= len(substr) && (s == substr || len(substr) == 0 ||
|
|
||||||
(len(s) > 0 && len(substr) > 0 && findSubstring(s, substr)))
|
|
||||||
}
|
|
||||||
|
|
||||||
func findSubstring(s, substr string) bool {
|
|
||||||
for i := 0; i <= len(s)-len(substr); i++ {
|
|
||||||
if s[i:i+len(substr)] == substr {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// createMacOSIncognitoCmd creates the appropriate incognito command for macOS browsers.
|
// createMacOSIncognitoCmd creates the appropriate incognito command for macOS browsers.
|
||||||
@@ -287,13 +273,13 @@ func tryDefaultBrowserWindows(url string) *exec.Cmd {
|
|||||||
var browserName string
|
var browserName string
|
||||||
|
|
||||||
// Map ProgId to browser name
|
// Map ProgId to browser name
|
||||||
if stringContains(output, "ChromeHTML") {
|
if strings.Contains(output, "ChromeHTML") {
|
||||||
browserName = "chrome"
|
browserName = "chrome"
|
||||||
} else if stringContains(output, "FirefoxURL") {
|
} else if strings.Contains(output, "FirefoxURL") {
|
||||||
browserName = "firefox"
|
browserName = "firefox"
|
||||||
} else if stringContains(output, "MSEdgeHTM") {
|
} else if strings.Contains(output, "MSEdgeHTM") {
|
||||||
browserName = "edge"
|
browserName = "edge"
|
||||||
} else if stringContains(output, "BraveHTML") {
|
} else if strings.Contains(output, "BraveHTML") {
|
||||||
browserName = "brave"
|
browserName = "brave"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -354,15 +340,15 @@ func tryDefaultBrowserLinux(url string) *exec.Cmd {
|
|||||||
var browserName string
|
var browserName string
|
||||||
|
|
||||||
// Map .desktop file to browser name
|
// Map .desktop file to browser name
|
||||||
if stringContains(desktop, "google-chrome") || stringContains(desktop, "chrome") {
|
if strings.Contains(desktop, "google-chrome") || strings.Contains(desktop, "chrome") {
|
||||||
browserName = "chrome"
|
browserName = "chrome"
|
||||||
} else if stringContains(desktop, "firefox") {
|
} else if strings.Contains(desktop, "firefox") {
|
||||||
browserName = "firefox"
|
browserName = "firefox"
|
||||||
} else if stringContains(desktop, "chromium") {
|
} else if strings.Contains(desktop, "chromium") {
|
||||||
browserName = "chromium"
|
browserName = "chromium"
|
||||||
} else if stringContains(desktop, "brave") {
|
} else if strings.Contains(desktop, "brave") {
|
||||||
browserName = "brave"
|
browserName = "brave"
|
||||||
} else if stringContains(desktop, "microsoft-edge") || stringContains(desktop, "msedge") {
|
} else if strings.Contains(desktop, "microsoft-edge") || strings.Contains(desktop, "msedge") {
|
||||||
browserName = "edge"
|
browserName = "edge"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user