|
4 | 4 | "encoding/json"
|
5 | 5 | "os"
|
6 | 6 | "path/filepath"
|
7 |
| - "runtime" |
8 | 7 |
|
9 |
| - "github.com/rkoesters/xdg/userdirs" |
| 8 | + "github.com/adrg/xdg" |
10 | 9 | "github.com/shirou/gopsutil/disk"
|
11 | 10 | )
|
12 | 11 |
|
@@ -34,22 +33,13 @@ func getWellKnownDirectories() []directory {
|
34 | 33 | directories := []directory{}
|
35 | 34 | wellKnownDirectories := []directory{
|
36 | 35 | {location: HomeDir, name: " Home"},
|
37 |
| - {location: userdirs.Download, name: " Downloads"}, |
38 |
| - {location: userdirs.Documents, name: " Documents"}, |
39 |
| - {location: userdirs.Pictures, name: " Pictures"}, |
40 |
| - {location: userdirs.Videos, name: " Videos"}, |
41 |
| - {location: userdirs.Music, name: "♬ Music"}, |
42 |
| - {location: userdirs.Templates, name: " Templates"}, |
43 |
| - {location: userdirs.PublicShare, name: " PublicShare"}, |
44 |
| - } |
45 |
| - |
46 |
| - if runtime.GOOS == "darwin" { |
47 |
| - wellKnownDirectories[1].location = HomeDir + "/Downloads/" |
48 |
| - wellKnownDirectories[2].location = HomeDir + "/Documents/" |
49 |
| - wellKnownDirectories[3].location = HomeDir + "/Pictures/" |
50 |
| - wellKnownDirectories[4].location = HomeDir + "/Movies/" |
51 |
| - wellKnownDirectories[5].location = HomeDir + "/Music/" |
52 |
| - wellKnownDirectories[7].location = HomeDir + "/Public/" |
| 36 | + {location: xdg.UserDirs.Download, name: " Downloads"}, |
| 37 | + {location: xdg.UserDirs.Documents, name: " Documents"}, |
| 38 | + {location: xdg.UserDirs.Pictures, name: " Pictures"}, |
| 39 | + {location: xdg.UserDirs.Videos, name: " Videos"}, |
| 40 | + {location: xdg.UserDirs.Music, name: "♬ Music"}, |
| 41 | + {location: xdg.UserDirs.Templates, name: " Templates"}, |
| 42 | + {location: xdg.UserDirs.PublicShare, name: " PublicShare"}, |
53 | 43 | }
|
54 | 44 |
|
55 | 45 | for _, dir := range wellKnownDirectories {
|
@@ -81,7 +71,7 @@ func getPinnedDirectories() []directory {
|
81 | 71 | return directories
|
82 | 72 | }
|
83 | 73 |
|
84 |
| -// Get external media directories |
| 74 | +// Get external media directories |
85 | 75 | func getExternalMediaFolders() (disks []directory) {
|
86 | 76 | parts, err := disk.Partitions(true)
|
87 | 77 |
|
|
0 commit comments