Always invalidate fastfetch logo cache

Author: iynaix

Cargo.toml

@@ -8,12 +8,17 @@ build = "build.rs"
 chrono = "0.4.42"
 clap = { version = "4.5.53", features = ["derive", "string"] }
 clap_complete = "4.5.61"
+chrono = "0.4.42"
+clap = { version = "4.5.53", features = ["derive", "string"] }
+clap_complete = "4.5.61"
 crossterm = "0.29.0"
 dirs = "6.0.0"
 fast_image_resize = { version = "5.3.0", features = ["image", "rayon"] }
 image = "0.25.9"
+fast_image_resize = { version = "5.3.0", features = ["image", "rayon"] }
+image = "0.25.9"
 nix = { version = "0.30.1", features = ["process"] }
-rexiv2 = { version = "0.10.0", optional = true }
+rexiv2 = { version = "0.10.0" }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 signal-hook = "0.3.18"
@@ -28,7 +33,6 @@ clap_mangen = "0.2.31"
 [features]
 default = ["nixos"]
 nixos = []
-iynaixos = ["rexiv2"]
 
 [lints.rust]
 unsafe_code = "forbid"

flake.lock

@@ -9,7 +9,6 @@
   fastfetch,
   glib,
   gexiv2,
-  iynaixos ? false,
 }:
 rustPlatform.buildRustPackage {
   pname = "wfetch";
@@ -32,7 +31,7 @@ rustPlatform.buildRustPackage {
   cargoLock.lockFile = ./Cargo.lock;
 
   buildNoDefaultFeatures = true;
-  buildFeatures = [ "nixos" ] ++ lib.optionals iynaixos [ "iynaixos" ];
+  buildFeatures = [ "nixos" ];
 
   # create files for shell autocomplete
   nativeBuildInputs = [
@@ -41,7 +40,7 @@ rustPlatform.buildRustPackage {
     pkg-config
   ];
 
-  buildInputs = lib.optionals iynaixos [
+  buildInputs = [
     glib
     gexiv2
   ];

package.nix

@@ -14,7 +14,8 @@ use crate::{
     asset_path,
     cli::WFetchArgs,
     colors::{self, Rgba8, Rgba8Ext},
-    create_output_file, wallpaper,
+    create_output_file,
+    wallpaper::{self, detect_iynaixos},
 };
 use crate::{colors::get_term_colors, wallpaper::geom_from_str};
 
@@ -130,7 +131,6 @@ pub fn resize_wallpaper(args: &WFetchArgs, term: &str, image_arg: &Option<String
         .decode()
         .expect("could not decode image");
 
-    #[cfg_attr(not(feature = "iynaixos"), allow(unused_mut))]
     let mut fallback_geometry = {
         let (width, height) =
             image::image_dimensions(&wall).expect("could not get image dimensions");
@@ -144,8 +144,7 @@ pub fn resize_wallpaper(args: &WFetchArgs, term: &str, image_arg: &Option<String
         }
     };
 
-    #[cfg(feature = "iynaixos")]
-    {
+    if detect_iynaixos().is_some() {
         fallback_geometry = wallpaper::info(&wall, fallback_geometry);
     }
 
@@ -256,6 +255,7 @@ impl Logo {
         json!({
             "type": logo_backend,
             "source": source,
+            "recache": true,
             "preserveAspectRatio": true,
         })
     }

src/logos.rs

@@ -3,11 +3,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use crate::{full_path, CommandUtf8};
+use crate::{CommandUtf8, full_path};
 
-#[cfg(feature = "iynaixos")]
 /// detect wallpaper using current-wallpaper file in tmpfs
-fn detect_iynaixos() -> Option<String> {
+pub fn detect_iynaixos() -> Option<String> {
     std::fs::read_to_string(
         dirs::runtime_dir()
             .expect("could not get XDG_RUNTIME_DIR")
@@ -29,7 +28,6 @@ pub fn geom_from_str(crop: &str) -> Option<(f64, f64, f64, f64)> {
     }
 }
 
-#[cfg(feature = "iynaixos")]
 /// reads the wallpaper info from image xmp metadata (w, h, x, y)
 pub fn info(image: &str, fallback: (f64, f64, f64, f64)) -> (f64, f64, f64, f64) {
     use rexiv2::Metadata;
@@ -131,7 +129,6 @@ where
         wallpaper_arg
             .as_ref()
             .and_then(|s| s.as_ref().to_str().map(std::string::ToString::to_string)),
-        #[cfg(feature = "iynaixos")]
         detect_iynaixos(),
         detect_swww(),
         detect_swaybg(),