Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use xdg-user-dir to find download directory

Browse Source 
Fixes #157
Closes #219
This commit is contained in:
Tulir Asokan 2021-09-19 23:46:33 -04:00
parent 15e05fc4e7
commit 42063e5f88
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@ -20,6 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -128,7 +129,7 @@ func UserDataDir() (dir string, err error) {
if dir == "" { if dir == "" {
dir = os.Getenv("HOME") dir = os.Getenv("HOME")
if dir == "" { if dir == "" {
return "", errors.New("neither $XDG_CACHE_HOME nor $HOME are defined") return "", errors.New("neither $XDG_DATA_HOME nor $HOME are defined")
} }
dir = filepath.Join(dir, ".local", "share") dir = filepath.Join(dir, ".local", "share")
} }
@ -136,7 +137,24 @@ func UserDataDir() (dir string, err error) {
return return
} }
func getXDGUserDir(name string) (dir string, err error) {
cmd := exec.Command("xdg-user-dir", name)
var out strings.Builder
cmd.Stdout = &out
err = cmd.Run()
dir = strings.TrimSpace(out.String())
return
}
func UserDownloadDir() (dir string, err error) { func UserDownloadDir() (dir string, err error) {
dir = os.Getenv("GOMUKS_DOWNLOAD_HOME")
if dir != "" {
return
}
dir, _ = getXDGUserDir("DOWNLOAD")
if dir != "" {
return
}
dir, err = os.UserHomeDir() dir, err = os.UserHomeDir()
dir = filepath.Join(dir, "Downloads") dir = filepath.Join(dir, "Downloads")
return return