From f399f589fb9acb5f920ade4362f5433e2fe42f27 Mon Sep 17 00:00:00 2001 From: piotr Date: Fri, 18 Nov 2022 01:40:50 +0100 Subject: [PATCH 1/5] add a line to debug #68 --- uicomponents.go | 1 + 1 file changed, 1 insertion(+) diff --git a/uicomponents.go b/uicomponents.go index 9295622..59d5b72 100644 --- a/uicomponents.go +++ b/uicomponents.go @@ -434,6 +434,7 @@ func searchUserDir(dir string) { fileSearchResultFlowBox.Add(btn) for _, path := range fileSearchResults { + log.Debugf("Path: %s", path) partOfPathToShow := strings.Split(path, userDirsMap[dir])[1] if partOfPathToShow != "" { if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) { From 52e63667c91e3a0450ac1de1e4aa7c05bc4de32d Mon Sep 17 00:00:00 2001 From: piotr Date: Mon, 28 Nov 2022 23:03:12 +0100 Subject: [PATCH 2/5] print userDirsMap -> log.Debugf #68 --- main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/main.go b/main.go index 06fc320..e063691 100644 --- a/main.go +++ b/main.go @@ -490,6 +490,7 @@ func main() { } userDirsMap = mapXdgUserDirs() + log.Debugf("User dirs map: %s", userDirsMap) placeholder, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0) resultsWrapper.PackStart(placeholder, true, true, 0) From d3a0fd04a44fb0cb114efff7f0ec845cd7a30c0f Mon Sep 17 00:00:00 2001 From: piotr Date: Mon, 28 Nov 2022 23:26:19 +0100 Subject: [PATCH 3/5] log if userDirsFile found #68 --- tools.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools.go b/tools.go index 18add21..45eb81b 100644 --- a/tools.go +++ b/tools.go @@ -80,6 +80,7 @@ func mapXdgUserDirs() map[string]string { userDirsFile := filepath.Join(home, ".config/user-dirs.dirs") if pathExists(userDirsFile) { + log.Debugf("userDirsFile found: %s", userDirsFile) log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile)) lines, _ := loadTextFile(userDirsFile) for _, l := range lines { @@ -104,7 +105,7 @@ func mapXdgUserDirs() map[string]string { } } } else { - log.Warnf("%s file not found, using defaults", userDirsFile) + log.Warnf("userDirsFile %s not found, using defaults", userDirsFile) } return result From 85cc2d78ee724cef0c637e37142fa664d766273b Mon Sep 17 00:00:00 2001 From: piotr Date: Mon, 28 Nov 2022 23:39:36 +0100 Subject: [PATCH 4/5] fix userDirsFile path #68 --- tools.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.go b/tools.go index 45eb81b..973208a 100644 --- a/tools.go +++ b/tools.go @@ -78,7 +78,7 @@ func mapXdgUserDirs() map[string]string { result["pictures"] = filepath.Join(home, "Pictures") result["videos"] = filepath.Join(home, "Videos") - userDirsFile := filepath.Join(home, ".config/user-dirs.dirs") + userDirsFile := filepath.Join(filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "user-dirs.dirs")) if pathExists(userDirsFile) { log.Debugf("userDirsFile found: %s", userDirsFile) log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile)) From cb6a7f44fea4f10450bd17dd07cb7b8adfa04d8e Mon Sep 17 00:00:00 2001 From: piotr Date: Thu, 1 Dec 2022 00:03:17 +0100 Subject: [PATCH 5/5] go-sway -> 1.2.0 --- go.mod | 8 ++++---- go.sum | 19 +++++++++++-------- main.go | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 98ac49f..f81fdfc 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/nwg-piotr/nwg-drawer -go 1.18 +go 1.19 require ( github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7 github.com/fsnotify/fsnotify v1.5.1 github.com/gotk3/gotk3 v0.6.1 - github.com/joshuarubin/go-sway v0.0.4 - github.com/sirupsen/logrus v1.8.1 + github.com/joshuarubin/go-sway v1.2.0 + github.com/sirupsen/logrus v1.9.0 ) require ( @@ -16,5 +16,5 @@ require ( go.uber.org/atomic v1.3.2 // indirect go.uber.org/multierr v1.1.0 // indirect golang.org/x/sync v0.0.0-20190412183630-56d357773e84 // indirect - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect ) diff --git a/go.sum b/go.sum index 4e40637..67033c9 100644 --- a/go.sum +++ b/go.sum @@ -9,24 +9,27 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/gotk3/gotk3 v0.6.1 h1:GJ400a0ecEEWrzjBvzBzH+pB/esEMIGdB9zPSmBdoeo= github.com/gotk3/gotk3 v0.6.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= -github.com/joshuarubin/go-sway v0.0.4 h1:dpmIwQ/LytG+oMrjmaVKdk1aPdW2feXK/+wAcLKIx4A= -github.com/joshuarubin/go-sway v0.0.4/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k= +github.com/joshuarubin/go-sway v1.2.0 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM= +github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k= github.com/joshuarubin/lifecycle v1.0.0 h1:N/lPEC8f+dBZ1Tn99vShqp36LwB+LI7XNAiNadZeLUQ= github.com/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= golang.org/x/sync v0.0.0-20190412183630-56d357773e84 h1:IqXQ59gzdXv58Jmm2xn0tSOR9i6HqroaOFRQ3wR/dJQ= golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index e063691..d99269a 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( "github.com/gotk3/gotk3/gtk" ) -const version = "0.3.4" +const version = "0.3.5" var ( appDirs []string