Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-15 01:32:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix connparse for wsl (#1843)

Browse Source 
Co-authored-by: sawka <mike@commandline.dev>
This commit is contained in:
Evan Simkowitz 2025-01-24 14:55:45 -08:00 committed by GitHub
parent b9f703f2b5
commit 270855f9cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/remote/connparse/connparse.go
View File

@ -87,11 +87,11 @@ func GetConnNameFromContext(ctx context.Context) (string, error) {
// ParseURI parses a connection URI and returns the connection type, host/path, and parameters.
func ParseURI(uri string) (*Connection, error) {
split := strings.SplitN(uri, "://", 2)
split := strings.SplitN(uri, "//", 2)
var scheme string
var rest string
if len(split) > 1 {
scheme = split[0]
scheme = strings.TrimSuffix(split[0], ":")
rest = split[1]
} else {
rest = split[0]
@ -99,10 +99,13 @@ func ParseURI(uri string) (*Connection, error) {
var host string
var remotePath string
if scheme == "" {
scheme = ConnectionTypeWsh
if strings.HasPrefix(rest, "//") {
rest = strings.TrimPrefix(rest, "//")
parseGenericPath := func() {
split = strings.SplitN(rest, "/", 2)
host = split[0]
if len(split) > 1 {
remotePath = split[1]
} else {
split = strings.SplitN(rest, "/", 2)
host = split[0]
if len(split) > 1 {
@ -110,6 +113,22 @@ func ParseURI(uri string) (*Connection, error) {
} else {
remotePath = "/"
}
}
}
parseWshPath := func() {
if strings.HasPrefix(rest, "wsl://") {
host = wslConnRegex.FindString(rest)
remotePath = strings.TrimPrefix(rest, host)
} else {
parseGenericPath()
}
}
if scheme == "" {
scheme = ConnectionTypeWsh
if len(rest) != len(uri) {
// This accounts for when the uri starts with "//", which would get trimmed in the first split.
parseWshPath()
} else if strings.HasPrefix(rest, "/~") {
host = wshrpc.LocalConnName
remotePath = rest
@ -117,19 +136,10 @@ func ParseURI(uri string) (*Connection, error) {
host = ConnHostCurrent
remotePath = rest
}
} else if scheme == ConnectionTypeWsh {
parseWshPath()
} else {
if strings.HasPrefix(rest, "wsl://") {
host = wslConnRegex.FindString(rest)
remotePath = strings.TrimPrefix(rest, host)
} else {
split = strings.SplitN(rest, "/", 2)
host = split[0]
if len(split) > 1 {
remotePath = split[1]
} else {
remotePath = "/"
}
}
parseGenericPath()
}
if scheme == ConnectionTypeWsh {

6
pkg/util/fileutil/fileutil.go
View File

@ -19,7 +19,7 @@ import (
func FixPath(path string) (string, error) {
if strings.HasPrefix(path, "~") {
return filepath.Join(wavebase.GetHomeDir(), path[1:]), nil
path = filepath.Join(wavebase.GetHomeDir(), path[1:])
} else if !filepath.IsAbs(path) {
log.Printf("FixPath: path is not absolute: %s", path)
path, err := filepath.Abs(path)
@ -27,10 +27,8 @@ func FixPath(path string) (string, error) {
return "", err
}
log.Printf("FixPath: fixed path: %s", path)
return path, nil
} else {
return path, nil
}
return path, nil
}
const (