Skip to content

Commit 28fbf4c

Browse files
adrgadrg
committed
Replace xdgPath and xdgPaths calls with pathutil equivalents
1 parent 9d18656 commit 28fbf4c

File tree

4 files changed

+62
-60
lines changed

4 files changed

+62
-60
lines changed

‎paths_darwin.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package xdg
33
import (
44
"path/filepath"
55

6+
"github.com/adrg/xdg/internal/pathutil"
67
"github.com/adrg/xdg/internal/userdirs"
78
)
89

@@ -16,17 +17,17 @@ func initBaseDirs(home string) {
1617
rootAppSupport := "/Library/Application Support"
1718

1819
// Initialize standard directories.
19-
baseDirs.dataHome = xdgPath(envDataHome, homeAppSupport)
20-
baseDirs.data = xdgPaths(envDataDirs, rootAppSupport)
21-
baseDirs.configHome = xdgPath(envConfigHome, homeAppSupport)
22-
baseDirs.config = xdgPaths(envConfigDirs,
20+
baseDirs.dataHome = pathutil.EnvPath(envDataHome, homeAppSupport)
21+
baseDirs.data = pathutil.EnvPathList(envDataDirs, rootAppSupport)
22+
baseDirs.configHome = pathutil.EnvPath(envConfigHome, homeAppSupport)
23+
baseDirs.config = pathutil.EnvPathList(envConfigDirs,
2324
filepath.Join(home, "Library", "Preferences"),
2425
rootAppSupport,
2526
"/Library/Preferences",
2627
)
27-
baseDirs.stateHome = xdgPath(envStateHome, homeAppSupport)
28-
baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(home, "Library", "Caches"))
29-
baseDirs.runtime = xdgPath(envRuntimeDir, homeAppSupport)
28+
baseDirs.stateHome = pathutil.EnvPath(envStateHome, homeAppSupport)
29+
baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, "Library", "Caches"))
30+
baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, homeAppSupport)
3031

3132
// Initialize non-standard directories.
3233
baseDirs.applications = []string{
@@ -42,12 +43,12 @@ func initBaseDirs(home string) {
4243
}
4344

4445
func initUserDirs(home string) {
45-
UserDirs.Desktop = xdgPath(userdirs.EnvDesktopDir, filepath.Join(home, "Desktop"))
46-
UserDirs.Download = xdgPath(userdirs.EnvDownloadDir, filepath.Join(home, "Downloads"))
47-
UserDirs.Documents = xdgPath(userdirs.EnvDocumentsDir, filepath.Join(home, "Documents"))
48-
UserDirs.Music = xdgPath(userdirs.EnvMusicDir, filepath.Join(home, "Music"))
49-
UserDirs.Pictures = xdgPath(userdirs.EnvPicturesDir, filepath.Join(home, "Pictures"))
50-
UserDirs.Videos = xdgPath(userdirs.EnvVideosDir, filepath.Join(home, "Movies"))
51-
UserDirs.Templates = xdgPath(userdirs.EnvTemplatesDir, filepath.Join(home, "Templates"))
52-
UserDirs.PublicShare = xdgPath(userdirs.EnvPublicShareDir, filepath.Join(home, "Public"))
46+
UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, filepath.Join(home, "Desktop"))
47+
UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, filepath.Join(home, "Downloads"))
48+
UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, filepath.Join(home, "Documents"))
49+
UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, filepath.Join(home, "Music"))
50+
UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, filepath.Join(home, "Pictures"))
51+
UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, filepath.Join(home, "Movies"))
52+
UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, filepath.Join(home, "Templates"))
53+
UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, filepath.Join(home, "Public"))
5354
}

‎paths_plan9.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package xdg
33
import (
44
"path/filepath"
55

6+
"github.com/adrg/xdg/internal/pathutil"
67
"github.com/adrg/xdg/internal/userdirs"
78
)
89

@@ -16,13 +17,13 @@ func initBaseDirs(home string) {
1617
rootLibDir := "/lib"
1718

1819
// Initialize standard directories.
19-
baseDirs.dataHome = xdgPath(envDataHome, homeLibDir)
20-
baseDirs.data = xdgPaths(envDataDirs, rootLibDir)
21-
baseDirs.configHome = xdgPath(envConfigHome, homeLibDir)
22-
baseDirs.config = xdgPaths(envConfigDirs, rootLibDir)
23-
baseDirs.stateHome = xdgPath(envStateHome, filepath.Join(homeLibDir, "state"))
24-
baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(homeLibDir, "cache"))
25-
baseDirs.runtime = xdgPath(envRuntimeDir, "/tmp")
20+
baseDirs.dataHome = pathutil.EnvPath(envDataHome, homeLibDir)
21+
baseDirs.data = pathutil.EnvPathList(envDataDirs, rootLibDir)
22+
baseDirs.configHome = pathutil.EnvPath(envConfigHome, homeLibDir)
23+
baseDirs.config = pathutil.EnvPathList(envConfigDirs, rootLibDir)
24+
baseDirs.stateHome = pathutil.EnvPath(envStateHome, filepath.Join(homeLibDir, "state"))
25+
baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(homeLibDir, "cache"))
26+
baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, "/tmp")
2627

2728
// Initialize non-standard directories.
2829
baseDirs.applications = []string{
@@ -37,12 +38,12 @@ func initBaseDirs(home string) {
3738
}
3839

3940
func initUserDirs(home string) {
40-
UserDirs.Desktop = xdgPath(userdirs.EnvDesktopDir, filepath.Join(home, "desktop"))
41-
UserDirs.Download = xdgPath(userdirs.EnvDownloadDir, filepath.Join(home, "downloads"))
42-
UserDirs.Documents = xdgPath(userdirs.EnvDocumentsDir, filepath.Join(home, "documents"))
43-
UserDirs.Music = xdgPath(userdirs.EnvMusicDir, filepath.Join(home, "music"))
44-
UserDirs.Pictures = xdgPath(userdirs.EnvPicturesDir, filepath.Join(home, "pictures"))
45-
UserDirs.Videos = xdgPath(userdirs.EnvVideosDir, filepath.Join(home, "videos"))
46-
UserDirs.Templates = xdgPath(userdirs.EnvTemplatesDir, filepath.Join(home, "templates"))
47-
UserDirs.PublicShare = xdgPath(userdirs.EnvPublicShareDir, filepath.Join(home, "public"))
41+
UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, filepath.Join(home, "desktop"))
42+
UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, filepath.Join(home, "downloads"))
43+
UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, filepath.Join(home, "documents"))
44+
UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, filepath.Join(home, "music"))
45+
UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, filepath.Join(home, "pictures"))
46+
UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, filepath.Join(home, "videos"))
47+
UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, filepath.Join(home, "templates"))
48+
UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, filepath.Join(home, "public"))
4849
}

‎paths_unix.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ func initDirs(home string) {
1818

1919
func initBaseDirs(home string) {
2020
// Initialize standard directories.
21-
baseDirs.dataHome = xdgPath(envDataHome, filepath.Join(home, ".local", "share"))
22-
baseDirs.data = xdgPaths(envDataDirs, "/usr/local/share", "/usr/share")
23-
baseDirs.configHome = xdgPath(envConfigHome, filepath.Join(home, ".config"))
24-
baseDirs.config = xdgPaths(envConfigDirs, "/etc/xdg")
25-
baseDirs.stateHome = xdgPath(envStateHome, filepath.Join(home, ".local", "state"))
26-
baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(home, ".cache"))
27-
baseDirs.runtime = xdgPath(envRuntimeDir, filepath.Join("/run/user", strconv.Itoa(os.Getuid())))
21+
baseDirs.dataHome = pathutil.EnvPath(envDataHome, filepath.Join(home, ".local", "share"))
22+
baseDirs.data = pathutil.EnvPathList(envDataDirs, "/usr/local/share", "/usr/share")
23+
baseDirs.configHome = pathutil.EnvPath(envConfigHome, filepath.Join(home, ".config"))
24+
baseDirs.config = pathutil.EnvPathList(envConfigDirs, "/etc/xdg")
25+
baseDirs.stateHome = pathutil.EnvPath(envStateHome, filepath.Join(home, ".local", "state"))
26+
baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, ".cache"))
27+
baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, filepath.Join("/run/user", strconv.Itoa(os.Getuid())))
2828

2929
// Initialize non-standard directories.
3030
appDirs := []string{
@@ -54,12 +54,12 @@ func initBaseDirs(home string) {
5454
func initUserDirs(home, configHome string) {
5555
userDirsMap := userdirs.ParseConfigFile(filepath.Join(configHome, "user-dirs.dirs"))
5656

57-
UserDirs.Desktop = xdgPath(userdirs.EnvDesktopDir, userDirsMap[userdirs.EnvDesktopDir], filepath.Join(home, "Desktop"))
58-
UserDirs.Download = xdgPath(userdirs.EnvDownloadDir, userDirsMap[userdirs.EnvDownloadDir], filepath.Join(home, "Downloads"))
59-
UserDirs.Documents = xdgPath(userdirs.EnvDocumentsDir, userDirsMap[userdirs.EnvDocumentsDir], filepath.Join(home, "Documents"))
60-
UserDirs.Music = xdgPath(userdirs.EnvMusicDir, userDirsMap[userdirs.EnvMusicDir], filepath.Join(home, "Music"))
61-
UserDirs.Pictures = xdgPath(userdirs.EnvPicturesDir, userDirsMap[userdirs.EnvPicturesDir], filepath.Join(home, "Pictures"))
62-
UserDirs.Videos = xdgPath(userdirs.EnvVideosDir, userDirsMap[userdirs.EnvVideosDir], filepath.Join(home, "Videos"))
63-
UserDirs.Templates = xdgPath(userdirs.EnvTemplatesDir, userDirsMap[userdirs.EnvTemplatesDir], filepath.Join(home, "Templates"))
64-
UserDirs.PublicShare = xdgPath(userdirs.EnvPublicShareDir, userDirsMap[userdirs.EnvPublicShareDir], filepath.Join(home, "Public"))
57+
UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, userDirsMap[userdirs.EnvDesktopDir], filepath.Join(home, "Desktop"))
58+
UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, userDirsMap[userdirs.EnvDownloadDir], filepath.Join(home, "Downloads"))
59+
UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, userDirsMap[userdirs.EnvDocumentsDir], filepath.Join(home, "Documents"))
60+
UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, userDirsMap[userdirs.EnvMusicDir], filepath.Join(home, "Music"))
61+
UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, userDirsMap[userdirs.EnvPicturesDir], filepath.Join(home, "Pictures"))
62+
UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, userDirsMap[userdirs.EnvVideosDir], filepath.Join(home, "Videos"))
63+
UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, userDirsMap[userdirs.EnvTemplatesDir], filepath.Join(home, "Templates"))
64+
UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, userDirsMap[userdirs.EnvPublicShareDir], filepath.Join(home, "Public"))
6565
}

‎paths_windows.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ func initDirs(home string) {
1616

1717
func initBaseDirs(home string, kf *knownFolders) {
1818
// Initialize standard directories.
19-
baseDirs.dataHome = xdgPath(envDataHome, kf.localAppData)
20-
baseDirs.data = xdgPaths(envDataDirs, kf.roamingAppData, kf.programData)
21-
baseDirs.configHome = xdgPath(envConfigHome, kf.localAppData)
22-
baseDirs.config = xdgPaths(envConfigDirs, kf.programData, kf.roamingAppData)
23-
baseDirs.stateHome = xdgPath(envStateHome, kf.localAppData)
24-
baseDirs.cacheHome = xdgPath(envCacheHome, filepath.Join(kf.localAppData, "cache"))
25-
baseDirs.runtime = xdgPath(envRuntimeDir, kf.localAppData)
19+
baseDirs.dataHome = pathutil.EnvPath(envDataHome, kf.localAppData)
20+
baseDirs.data = pathutil.EnvPathList(envDataDirs, kf.roamingAppData, kf.programData)
21+
baseDirs.configHome = pathutil.EnvPath(envConfigHome, kf.localAppData)
22+
baseDirs.config = pathutil.EnvPathList(envConfigDirs, kf.programData, kf.roamingAppData)
23+
baseDirs.stateHome = pathutil.EnvPath(envStateHome, kf.localAppData)
24+
baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(kf.localAppData, "cache"))
25+
baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, kf.localAppData)
2626

2727
// Initialize non-standard directories.
2828
baseDirs.applications = []string{
@@ -36,14 +36,14 @@ func initBaseDirs(home string, kf *knownFolders) {
3636
}
3737

3838
func initUserDirs(home string, kf *knownFolders) {
39-
UserDirs.Desktop = xdgPath(userdirs.EnvDesktopDir, kf.desktop)
40-
UserDirs.Download = xdgPath(userdirs.EnvDownloadDir, kf.downloads)
41-
UserDirs.Documents = xdgPath(userdirs.EnvDocumentsDir, kf.documents)
42-
UserDirs.Music = xdgPath(userdirs.EnvMusicDir, kf.music)
43-
UserDirs.Pictures = xdgPath(userdirs.EnvPicturesDir, kf.pictures)
44-
UserDirs.Videos = xdgPath(userdirs.EnvVideosDir, kf.videos)
45-
UserDirs.Templates = xdgPath(userdirs.EnvTemplatesDir, kf.templates)
46-
UserDirs.PublicShare = xdgPath(userdirs.EnvPublicShareDir, kf.public)
39+
UserDirs.Desktop = pathutil.EnvPath(userdirs.EnvDesktopDir, kf.desktop)
40+
UserDirs.Download = pathutil.EnvPath(userdirs.EnvDownloadDir, kf.downloads)
41+
UserDirs.Documents = pathutil.EnvPath(userdirs.EnvDocumentsDir, kf.documents)
42+
UserDirs.Music = pathutil.EnvPath(userdirs.EnvMusicDir, kf.music)
43+
UserDirs.Pictures = pathutil.EnvPath(userdirs.EnvPicturesDir, kf.pictures)
44+
UserDirs.Videos = pathutil.EnvPath(userdirs.EnvVideosDir, kf.videos)
45+
UserDirs.Templates = pathutil.EnvPath(userdirs.EnvTemplatesDir, kf.templates)
46+
UserDirs.PublicShare = pathutil.EnvPath(userdirs.EnvPublicShareDir, kf.public)
4747
}
4848

4949
type knownFolders struct {

0 commit comments

Comments
 (0)