perf(wallpaper): avoid recursion for system wallpapers

cosmic-settings/src/pages/desktop/wallpaper/mod.rs

@@ -221,12 +221,10 @@ impl page::Page<crate::pages::Message> for Page {
 
         let current_folder = self.config.current_folder().to_owned();
 
-        let recurse = self.categories.selected == Some(Category::Wallpapers);
-
         let (task, on_enter_handle) = Task::future(async move {
             let (service_config, displays) = wallpaper::config().await;
 
-            let mut selection = change_folder(current_folder, recurse).await;
+            let mut selection = change_folder(current_folder).await;
 
             // `selection.active` is usually empty because `change_folder` creates a fresh context.
             // This leads to blank previews in certain conditions when the program is restarted.
@@ -578,7 +576,7 @@ impl Page {
                 if self.config.current_folder.is_some() {
                     let _ = self.config.set_current_folder(None);
                     task = cosmic::task::future(async move {
-                        let folder = change_folder(Config::default_folder().to_owned(), true).await;
+                        let folder = change_folder(Config::default_folder().to_owned()).await;
                         Message::ChangeFolder(folder)
                     });
                 } else {
@@ -598,7 +596,7 @@ impl Page {
                     }
 
                     task = cosmic::task::future(async move {
-                        Message::ChangeFolder(change_folder(path, false).await)
+                        Message::ChangeFolder(change_folder(path).await)
                     });
                 }
             }
@@ -903,12 +901,9 @@ impl Page {
                         }
                     }
 
-                    // Avoid walking user-selected folders.
-                    let recurse = self.categories.selected == Some(Category::Wallpapers);
-
                     // Load the wallpapers from the selected folder into the view.
                     return cosmic::Task::future(async move {
-                        let message = Message::ChangeFolder(change_folder(path, recurse).await);
+                        let message = Message::ChangeFolder(change_folder(path).await);
                         let page_message = crate::pages::Message::DesktopWallpaper(message);
                         crate::Message::PageMessage(page_message)
                     });
@@ -1138,22 +1133,31 @@ impl Context {
     }
 }
 
-pub async fn change_folder(current_folder: PathBuf, recurse: bool) -> Context {
+pub async fn change_folder(current_folder: PathBuf) -> Context {
     let mut update = Context::default();
-    let mut wallpapers = wallpaper::load_each_from_path(current_folder, recurse).await;
+    let mut streams = Vec::with_capacity(2);
+
+    // Include the cosmic background folder when loading the system wallpapers.
+    if current_folder == Config::default_folder() {
+        streams.push(wallpaper::load_each_from_path(Config::default_folder().join("cosmic")).await);
+    }
 
-    while let Some((path, display_image, selection_image)) = wallpapers.next().await {
-        let id = update.paths.insert(path);
+    streams.push(wallpaper::load_each_from_path(current_folder).await);
 
-        update.display_images.insert(id, display_image);
+    for mut wallpapers in streams {
+        while let Some((path, display_image, selection_image)) = wallpapers.next().await {
+            let id = update.paths.insert(path);
 
-        let selection_handle = ImageHandle::from_rgba(
-            selection_image.width(),
-            selection_image.height(),
-            selection_image.into_vec(),
-        );
+            update.display_images.insert(id, display_image);
 
-        update.selection_handles.insert(id, selection_handle);
+            let selection_handle = ImageHandle::from_rgba(
+                selection_image.width(),
+                selection_image.height(),
+                selection_image.into_vec(),
+            );
+
+            update.selection_handles.insert(id, selection_handle);
+        }
     }
 
     update

cosmic-settings/src/pages/display/mod.rs

@@ -22,14 +22,14 @@ use slab::Slab;
 use slotmap::{Key, SecondaryMap, SlotMap};
 use std::{collections::BTreeMap, process::ExitStatus, sync::Arc};
 use tokio::sync::oneshot;
-use tokio::task::JoinHandle;
 use tracing::error;
 
 static DPI_SCALES: &[u32] = &[50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300];
 static DPI_SCALE_LABELS: Lazy<Vec<String>> =
     Lazy::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect());
 
 /// Display color depth options
+#[allow(dead_code)]
 #[derive(Clone, Copy, Debug)]
 pub struct ColorDepth(usize);
 

pages/wallpapers/src/lib.rs

@@ -97,44 +97,36 @@ pub fn cache_dir() -> Option<PathBuf> {
 #[must_use]
 pub async fn load_each_from_path(
     path: PathBuf,
-    recurse: bool,
 ) -> Pin<Box<dyn Send + Stream<Item = (PathBuf, RgbaImage, RgbaImage)>>> {
     let wallpapers = tokio::task::spawn_blocking(move || {
-        // Directories to search recursively.
-        let mut paths = vec![path];
         // Discovered image files that will be loaded as wallpapers.
         let mut wallpapers = BTreeSet::new();
 
-        while let Some(path) = paths.pop() {
-            if let Ok(dir) = path.read_dir() {
-                for entry in dir.filter_map(Result::ok) {
-                    let Ok(file_type) = entry.file_type() else {
-                        continue;
-                    };
+        if let Ok(dir) = path.read_dir() {
+            for entry in dir.filter_map(Result::ok) {
+                let Ok(file_type) = entry.file_type() else {
+                    continue;
+                };
 
-                    let path = entry.path();
+                let path = entry.path();
 
-                    // Recursively search directories, while storing only image files.
-                    if recurse && file_type.is_dir() {
-                        paths.push(path);
-                    } else if file_type.is_file() {
-                        let path = if path.extension().map_or(false, |ext| ext == "jxl") {
+                if file_type.is_file() {
+                    let path = if path.extension().map_or(false, |ext| ext == "jxl") {
+                        path
+                    } else if let Ok(Some(kind)) = infer::get_from_path(&path) {
+                        if infer::MatcherType::Image == kind.matcher_type() {
                             path
-                        } else if let Ok(Some(kind)) = infer::get_from_path(&path) {
-                            if infer::MatcherType::Image == kind.matcher_type() {
-                                path
-                            } else {
-                                continue;
-                            }
                         } else {
                             continue;
-                        };
+                        }
+                    } else {
+                        continue;
+                    };
 
-                        wallpapers.insert(path);
+                    wallpapers.insert(path);
 
-                        if wallpapers.len() > 99 {
-                            break;
-                        }
+                    if wallpapers.len() > 99 {
+                        break;
                     }
                 }
             }