Skip to content

refactor: simplify internal buffer, error handling, and path logic #3955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srpvpn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: simplify internal buffer, error handling, and path logic #3955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions internal/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,23 +404,26 @@ func ReplaceHome(path string) (string, error) {

var userData *user.User
var err error
var home string

homeString := strings.Split(path, "/")[0]
if homeString == "~" {
if len(path) == 1 || path[1] == '/' {
userData, err = user.Current()
if err != nil {
return "", errors.New("Could not find user: " + err.Error())
return "", fmt.Errorf("Could not find user: %w", err)
}
home = userData.HomeDir
path = path[1:]
} else {
userData, err = user.Lookup(homeString[1:])
homeString := strings.SplitN(path[1:], "/", 2)[0]
userData, err = user.Lookup(homeString)
if err != nil {
return "", errors.New("Could not find user: " + err.Error())
return "", fmt.Errorf("Could not find user: %w", err)
}
home = userData.HomeDir
path = path[1+len(homeString):]
}

home := userData.HomeDir

return strings.Replace(path, homeString, home, 1), nil
return home + path, nil
}

// GetPathAndCursorPosition returns a filename without everything following a `:`
Expand Down