From ebcff10f00137118269036d5cb2fdf3c0e89faa0 Mon Sep 17 00:00:00 2001 From: InioX Date: Wed, 13 Nov 2024 15:19:38 +0100 Subject: [PATCH 1/2] fix: add `dump-json` to default features --- Cargo.toml | 1 + example/config.toml | 1 - src/helpers.rs | 6 +----- src/wallpaper/mod.rs | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2f06382..c56d7ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ winapi = { version = "0.3", features = ["winuser"] } enquote = "1.1.0" [features] +default = ["dump-json"] update-informer = ["dep:update-informer"] web-image = ["dep:reqwest"] dump-json = ["dep:serde_json"] diff --git a/example/config.toml b/example/config.toml index c74c289..a5f100f 100644 --- a/example/config.toml +++ b/example/config.toml @@ -4,7 +4,6 @@ [config.wallpaper] command = "swww" arguments = ["img", "--transition-type", "center"] -set = true # pre_hook = "" [config.custom_keywords] diff --git a/src/helpers.rs b/src/helpers.rs index 4ac6777..d54071f 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -63,11 +63,7 @@ pub fn set_wallpaper(source: &Source, wallpaper_cfg: wallpaper::Wallpaper) -> Re #[cfg(feature = "web-image")] Source::WebImage { .. } => return Ok(()), }; - if !wallpaper_cfg.set { - return Ok(warn!( - "Wallpaper setting disabled, not setting wallpaper..." - )); - }; + #[cfg(target_os = "windows")] wallpaper::windows::set(path)?; #[cfg(target_os = "macos")] diff --git a/src/wallpaper/mod.rs b/src/wallpaper/mod.rs index a261724..54a63fb 100644 --- a/src/wallpaper/mod.rs +++ b/src/wallpaper/mod.rs @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct Wallpaper { - pub set: bool, /// Useful for, for example, killing the wallpaper daemon pub pre_hook: Option, pub command: String, From cfe7b0261787e0450e631505ec94dbaa434fbe4f Mon Sep 17 00:00:00 2001 From: ini <81521595+InioX@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:29:11 +0100 Subject: [PATCH 2/2] chore: release v2.4.1 --- CHANGELOG.md | 10 ++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a6d165..dd95047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.4.1](https://github.com/InioX/matugen/compare/v2.4.0...v2.4.1) - 2024-11-13 + +### Fixed + +- add `dump-json` to default features + +### Other + +- *(readme)* add discord server link + ## [2.4.0](https://github.com/InioX/matugen/compare/v2.3.0...v2.4.0) - 2024-11-03 ### Added diff --git a/Cargo.lock b/Cargo.lock index bd48edc..99b5f3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1218,7 +1218,7 @@ dependencies = [ [[package]] name = "matugen" -version = "2.4.0" +version = "2.4.1" dependencies = [ "clap", "color-eyre", diff --git a/Cargo.toml b/Cargo.toml index c56d7ac..a7b2d7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "matugen" -version = "2.4.0" +version = "2.4.1" authors = ["InioX"] description = "A material you color generation tool with templates" repository = "https://github.com/InioX/matugen"