Release 2.7.3.3: dark theme and Amnezia vpn:// import fixes.
This commit is contained in:
@@ -4,6 +4,7 @@ import "strings"
|
||||
|
||||
// DetectProtocol infers protocol from a share/proxy URI or config body.
|
||||
func DetectProtocol(raw string) Protocol {
|
||||
raw = stripShareNoise(raw)
|
||||
lower := strings.ToLower(strings.TrimSpace(raw))
|
||||
switch {
|
||||
case strings.HasPrefix(lower, "hysteria2://"), strings.HasPrefix(lower, "hy2://"):
|
||||
@@ -29,3 +30,22 @@ func DetectProtocol(raw string) Protocol {
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func stripShareNoise(raw string) string {
|
||||
raw = strings.TrimPrefix(raw, "\ufeff")
|
||||
var b strings.Builder
|
||||
for _, r := range raw {
|
||||
switch r {
|
||||
case '\u200b', '\u200c', '\u200d', '\u2060', '\ufeff',
|
||||
'\u2066', '\u2067', '\u2068', '\u2069',
|
||||
'\u200e', '\u200f',
|
||||
'\u202a', '\u202b', '\u202c', '\u202d', '\u202e':
|
||||
continue
|
||||
}
|
||||
if r < 0x20 && r != '\n' && r != '\r' && r != '\t' {
|
||||
continue
|
||||
}
|
||||
b.WriteRune(r)
|
||||
}
|
||||
return strings.TrimSpace(b.String())
|
||||
}
|
||||
|
||||
@@ -90,7 +90,17 @@ func (c *Config) UpsertProfile(name, proxy string) error {
|
||||
}
|
||||
|
||||
// UpsertProfileWithProtocol creates/updates a profile and optionally sets protocol.
|
||||
// The upserted profile becomes Active.
|
||||
func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) error {
|
||||
return c.upsertProfile(name, proxy, proto, true)
|
||||
}
|
||||
|
||||
// UpsertProfileKeepActive creates/updates a profile without changing Active.
|
||||
func (c *Config) UpsertProfileKeepActive(name, proxy string, proto Protocol) error {
|
||||
return c.upsertProfile(name, proxy, proto, false)
|
||||
}
|
||||
|
||||
func (c *Config) upsertProfile(name, proxy string, proto Protocol, activate bool) error {
|
||||
name = strings.TrimSpace(name)
|
||||
if name == "" {
|
||||
return fmt.Errorf("имя профиля пустое")
|
||||
@@ -110,7 +120,9 @@ func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) e
|
||||
if len(c.Profiles[i].Listen) == 0 {
|
||||
c.Profiles[i].Listen = defaultListen()
|
||||
}
|
||||
c.Active = name
|
||||
if activate {
|
||||
c.Active = name
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -121,7 +133,9 @@ func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) e
|
||||
Proxy: proxy,
|
||||
Listen: defaultListen(),
|
||||
})
|
||||
c.Active = name
|
||||
if activate {
|
||||
c.Active = name
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user