From e229ae1440d1d23cbb90cadb5dd88cc3e5103cd6 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 31 Jul 2024 23:13:59 +0200 Subject: [PATCH] update wallpapers on start --- CHANGELOG.md | 4 ++++ event.go | 14 -------------- main.go | 10 +++------- wallpaper.go | 18 ++++++++++++++++++ 4 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 event.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee4019..5287b0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ [Unreleased] +## v1.1.1 +### Fixed +- Update wallpapers on start + ## v1.1.0 ### Changed - Refactoring diff --git a/event.go b/event.go deleted file mode 100644 index d59241d..0000000 --- a/event.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - "os/exec" -) - -func HandleFocusEvent(config Config) (*exec.Cmd, error) { - files, err := GetOutputsWallpapers(config) - if err != nil { - return nil, err - } - - return FehUpdateWallpapers(files) -} diff --git a/main.go b/main.go index 0c9e58a..ad7c01a 100644 --- a/main.go +++ b/main.go @@ -21,17 +21,13 @@ func main() { os.Exit(1) } + UpdateWallapers(config) + for recv.Next() { event := recv.Event().(*i3.WorkspaceEvent) if event.Change == "focus" { - cmd, err := HandleFocusEvent(config) - - if err != nil { - log.Printf("[ERROR] cmd=%s error=%s", cmd.String(), err.Error()) - } else { - log.Printf("[SUCCESS] cmd=%s", cmd.String()) - } + UpdateWallapers(config) } } } diff --git a/wallpaper.go b/wallpaper.go index 3fe854e..bbef976 100644 --- a/wallpaper.go +++ b/wallpaper.go @@ -1,6 +1,8 @@ package main import ( + "log" + "go.i3wm.org/i3" ) @@ -34,3 +36,19 @@ func GetOutputsWallpapers(config Config) ([]string, error) { return files, nil } + +func UpdateWallapers(config Config) { + files, err := GetOutputsWallpapers(config) + if err != nil { + log.Printf("[ERROR] %s", err.Error()) + return + } + + cmd, err := FehUpdateWallpapers(files) + + if err != nil { + log.Printf("[ERROR] cmd=%s error=%s", cmd.String(), err.Error()) + } else { + log.Printf("[SUCCESS] cmd=%s", cmd.String()) + } +}