Added vendored_sources meson option and code cleanup.

Author: nikolaizombie1

.cargo/config.toml

@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."vendored-sources"]
+directory = "vendor"

.cargo/config.toml.disabled

@@ -1,6 +1,6 @@
 [package]
 name = "waytrogen"
-version = "0.9.6"
+version = "0.9.8"
 edition = "2024"
 
 [dependencies]

Cargo.lock

@@ -26,18 +26,12 @@
           strictDeps = true;
           nativeBuildInputs = with pkgs; [
             pkg-config
-            glib
-            wrapGAppsHook4
-            bash
             dbus
           ];
           buildInputs = with pkgs; [
-            glib
-            gtk4
             ffmpeg
             sqlite
             openssl
-            gsettings-desktop-schemas
             libX11
             libXcursor
             libXrandr
@@ -64,7 +58,7 @@
         # Layer 3: Meson handles everything else (i18n, schemas, icons, desktop file)
         waytrogen = pkgs.stdenv.mkDerivation {
           pname = "waytrogen";
-          version = "0.9.6";
+          version = "0.9.8";
           src = ./.;
 
 
@@ -73,33 +67,22 @@
             ninja
             pkg-config
             desktop-file-utils
-            wrapGAppsHook4
-            makeWrapper
-            glib
-            sqlite
-            bash
-            rustc
-            gtk4
             dbus
             cargo-udeps
             xdg-utils
             xdg-desktop-portal
+            rustc
           ];
 
           buildInputs = with pkgs; [
-            glib
-            gtk4
             ffmpeg
             sqlite
-            openssl
             dbus
             xdg-utils
             xdg-desktop-portal
           ];
 
           mesonFlags = [
-            "-Dcargo_features=nixos"
-            # Point meson at the pre-built binary from layer 2
             "-Dprecompiled_binary=${waytrogen-bin}/bin/waytrogen"
           ];
 
@@ -150,30 +133,20 @@
             export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath buildInputs}"
           '';
           nativeBuildInputs = with pkgs; [
-            glibcLocales
             pkg-config
-            glib
-            wrapGAppsHook4
-            bash
             cargo-udeps
             meson
             ninja
             desktop-file-utils
             dbus
           ];
           buildInputs = with pkgs; [
-            glib
-            gtk4
             ffmpeg
-            sqlite
             openssl
-            gsettings-desktop-schemas
             killall
-            socat
             cargo
             clippy
             rust-analyzer
-            sqlite
             pkg-config
             libX11
             libXcursor

Cargo.toml

@@ -1,7 +1,7 @@
 project(
     'waytrogen',
     'rust',
-    version: '0.9.6',
+    version: '0.9.8',
     license: 'Unlicence',
     meson_version: '>= 1.2.0',
     default_options: ['rust_std=2021'],

flake.lock

@@ -1,3 +1,4 @@
 option('cargo_features', type: 'string', value: '')
 option('debian_install', type: 'boolean', value: false)
-option('precompiled_binary', type: 'string', value: '')
+option('precompiled_binary', type: 'string', value: '')
+option('vendored_sources', type: 'boolean', value: false)

flake.nix

@@ -376,7 +376,7 @@ impl BootFn<AppState, Messages> for AppState {
         if !instance.swaybg_color.starts_with('#') {
             instance.swaybg_color = "#000000".to_string();
         }
-        if instance.awww_fill_color.is_empty() || instance.awww_fill_color.contains("#") {
+        if instance.awww_fill_color.is_empty() || instance.awww_fill_color.contains('#') {
             instance.awww_fill_color = "000000ff".to_string();
         }
         if instance.gslapper_scale_mode.is_none() {
@@ -539,7 +539,7 @@ impl AppState {
             rayon::spawn(move || {
                 let mut entries: Vec<(PathBuf, SortKey)> = WalkDir::new(&wf)
                     .into_iter()
-                    .filter_map(|e| e.ok())
+                    .filter_map(std::result::Result::ok)
                     .filter_map(|e| {
                         let path = e.into_path();
                         let ext = path.extension()?.to_str()?.to_ascii_lowercase();
@@ -652,8 +652,11 @@ impl AppState {
         let mut all_images = self.image_grid_images.clone();
         all_images.append(&mut self.filtered_images.clone());
 
-        let accepted_formats = self.changer.as_ref().map(|c| c.accepted_formats());
-        let favorites_only = self.favorite_images_only.clone();
+        let accepted_formats = self
+            .changer
+            .as_ref()
+            .map(super::wallpaper_changers::WallpaperChanger::accepted_formats);
+        let favorites_only = self.favorite_images_only;
 
         Task::future(async move {
             let (tx, rx) = futures::channel::oneshot::channel();
@@ -756,20 +759,20 @@ impl AppState {
         image_file.favorite = !image_file.favorite;
         debug!("Image favorite After: {}", image_file.favorite);
         match conn.insert_image_file(&image_file) {
-            Ok(_) => {
+            Ok(()) => {
                 self.image_grid_images
                     .iter_mut()
                     .filter(|p| p.path == image_path)
                     .for_each(|p| {
                         p.favorite = !p.favorite;
-                        debug!("File: {:#?}", p);
+                        debug!("File: {p:#?}");
                     });
                 self.filtered_images
                     .iter_mut()
                     .filter(|p| p.path == image_path)
                     .for_each(|p| {
                         p.favorite = !p.favorite;
-                        debug!("File: {:#?}", p);
+                        debug!("File: {p:#?}");
                     });
                 if self.favorite_images_only {
                     self.filter_images(self.image_filter.clone())

meson.build

@@ -76,7 +76,7 @@ pub fn change_awww_wallpaper(awww_changer: WallpaperChangers, image: PathBuf, mo
             .arg("--resize")
             .arg(resize_mode)
             .arg("--fill-color")
-            .arg(&settings.fill_color.replace("#", ""));
+            .arg(settings.fill_color.replace('#', ""));
         if monitor != TRANSLATION.get_translation("All") {
             command.arg("--outputs").arg(monitor);
         }