diff --git a/.fpm b/.fpm index 247b8cf..747df4e 100644 --- a/.fpm +++ b/.fpm @@ -3,5 +3,4 @@ --license agpl3 --description "Wallpaper manager for i3" --url "https://gitnet.fr/deblan/i3-wallpaper-manager" ---deb-recommends "feh" --maintainer "Simon Vieille " diff --git a/.gitea/issue_template/FEATURE_TEMPLATE.yml b/.gitea/issue_template/FEATURE_TEMPLATE.yml deleted file mode 100644 index 3d687c5..0000000 --- a/.gitea/issue_template/FEATURE_TEMPLATE.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: New feature -about: Use this template if you want to request a feature -title: "[FEATURE] " -labels: - - Kind/Enhancement -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this feature request! - - - type: textarea - id: description - attributes: - label: Description - description: Describe the feature. - validations: - required: true - - - type: textarea - id: benefits - attributes: - label: Benefits - description: Describe the benefits of this feature. - validations: - required: true - - - type: textarea - id: extra - attributes: - label: More informations - description: If you want to share more things, this is here! - validations: - required: false diff --git a/.gitea/issue_template/ISSUE_TEMPLATE.yml b/.gitea/issue_template/ISSUE_TEMPLATE.yml deleted file mode 100644 index 0a703fd..0000000 --- a/.gitea/issue_template/ISSUE_TEMPLATE.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: New issue -about: Use this template if you have a bug -title: "[Bug] " -labels: - - Kind/Bug -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this bug report! - - - type: textarea - id: environment - attributes: - label: Environment - value: | - * i3 wallpaper manager version: - * i3-wm version: - * Operating system and version: - validations: - required: true - - - type: textarea - id: configuration - attributes: - label: Configuration - value: | - ``` - ``` - validations: - required: false - - - type: textarea - id: steps - attributes: - label: Steps to reproduce - description: How reproduce the bug? - validations: - required: false - - - type: textarea - id: resuts - attributes: - label: Observed Results - description: What happened? - validations: - required: false - - - type: textarea - id: expected - attributes: - label: Expected Results - description: What should happen? - validations: - required: false - - - type: textarea - id: extra - attributes: - label: More informations - description: If you want to share more things, this is here! - validations: - required: false diff --git a/.gitea/issue_template/QUESTION_TEMPLATE.yml b/.gitea/issue_template/QUESTION_TEMPLATE.yml deleted file mode 100644 index 30fd73c..0000000 --- a/.gitea/issue_template/QUESTION_TEMPLATE.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: New question -about: Use this template when you don't know how to do something -title: "[Question] " -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill information. - - - type: textarea - id: environment - attributes: - label: Environment - value: | - * i3 wallpaper manager version: - * i3-wm version: - * Operating system and version: - validations: - required: true - - - type: textarea - id: question - attributes: - label: Question - validations: - required: true diff --git a/.gitea/issue_template/config.yml b/.gitea/issue_template/config.yml deleted file mode 100644 index d3fdf27..0000000 --- a/.gitea/issue_template/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: Documentation - url: https://gitnet.fr/deblan/i3-wallpaper-manager - about: Official documentation web site - - name: Ask a question in our Matrix room - about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue. - url: https://matrix.to/#/!QDcaVhvLZlhptPkGVi:neutralnetwork.org?via=neutralnetwork.org diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aab162..df5d447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,5 @@ [Unreleased] -## v1.2.1 -### Added -- Add debian packaging deb-recommends -### Fixed -- Fix #1: add cache of latest command to not run wallpaper update when it's already up to date - ## v1.2.0 ### Added - Add `callback` option diff --git a/README.md b/README.md index 4bfe0b1..6a38d38 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 🖥️ i3 Wallpaper Manager +# 🖥️ i3 wallpaper manager -**i3 Wallpaper Manager** is a command-line tool designed to change the wallpaper depending of active workspaces on [i3](https://i3wm.org/). This tool works on one or multiple screens. +**i3 wallpaper manager** is a command-line tool designed to change the wallpaper depending of active workspaces on [i3](https://i3wm.org/). This tool works on one or multiple screens. @@ -46,7 +46,7 @@ DISPLAY=:0 i3-wallpaper-manager /path/to/config.yaml To run it when i3 starts, add this to your i3 configuration: ```bash -exec --no-startup-id DISPLAY=:0 i3-wallpaper-manager /path/to/config.yaml +exec_always DISPLAY=:0 i3-wallpaper-manager /path/to/config.yaml ``` If you wish to use a program other than `feh`, set the `callback` parameter by specifying the path to your script. @@ -64,7 +64,6 @@ WALLPAPER_1="$2" SCREEN_2="$3" WALLPAPER_2="$4" -# etc. # Do stuff... ``` diff --git a/callback.go b/callback.go index 270c942..63a9fc0 100644 --- a/callback.go +++ b/callback.go @@ -5,7 +5,7 @@ import ( "os/exec" ) -func CallbackUpdateWallpapers(callback string, files, screens []string) *exec.Cmd { +func CallbackUpdateWallpapers(callback string, files, screens []string) (*exec.Cmd, error) { args := []string{} for key, file := range files { @@ -15,5 +15,5 @@ func CallbackUpdateWallpapers(callback string, files, screens []string) *exec.Cm cmd := exec.Command(callback, args...) cmd.Env = os.Environ() - return cmd + return cmd, cmd.Run() } diff --git a/feh.go b/feh.go index 9e8b562..4884960 100644 --- a/feh.go +++ b/feh.go @@ -5,7 +5,7 @@ import ( "os/exec" ) -func FehUpdateWallpapers(files []string) *exec.Cmd { +func FehUpdateWallpapers(files []string) (*exec.Cmd, error) { args := []string{} for _, file := range files { @@ -15,5 +15,5 @@ func FehUpdateWallpapers(files []string) *exec.Cmd { cmd := exec.Command("feh", args...) cmd.Env = os.Environ() - return cmd + return cmd, cmd.Run() } diff --git a/main.go b/main.go index 81c8d3e..ad7c01a 100644 --- a/main.go +++ b/main.go @@ -16,21 +16,18 @@ func main() { } config, err := LoadConfiguration(os.Args[1]) - if err != nil { log.Printf("[ERROR] %s", err.Error()) os.Exit(1) } - var lastCommand string - - UpdateWallapers(config, &lastCommand) + UpdateWallapers(config) for recv.Next() { event := recv.Event().(*i3.WorkspaceEvent) if event.Change == "focus" { - UpdateWallapers(config, &lastCommand) + UpdateWallapers(config) } } } diff --git a/wallpaper.go b/wallpaper.go index bec24d4..1919652 100644 --- a/wallpaper.go +++ b/wallpaper.go @@ -40,7 +40,7 @@ func GetOutputsWallpapers(config Config) ([]string, []string, error) { return files, screens, nil } -func UpdateWallapers(config Config, lastCommand *string) { +func UpdateWallapers(config Config) { files, screens, err := GetOutputsWallpapers(config) if err != nil { log.Printf("[ERROR] %s", err.Error()) @@ -50,22 +50,14 @@ func UpdateWallapers(config Config, lastCommand *string) { var cmd *exec.Cmd if config.Callback == "" { - cmd = FehUpdateWallpapers(files) + cmd, err = FehUpdateWallpapers(files) } else { - cmd = CallbackUpdateWallpapers(config.Callback, files, screens) + cmd, err = CallbackUpdateWallpapers(config.Callback, files, screens) } - if cmd.String() == *lastCommand { - log.Printf("[INFO] wallapaper(s) already up to date") - return - } - - err = cmd.Run() - if err != nil { log.Printf("[ERROR] cmd=%s error=%s", cmd.String(), err.Error()) } else { log.Printf("[SUCCESS] cmd=%s", cmd.String()) - *lastCommand = cmd.String() } }