From 6eb453136d3c658cd2971353e911fdd948c25a35 Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Sun, 21 Sep 2025 14:54:33 -0400
Subject: [PATCH] Wallpaper: cached images goes to their own subfolder.

---
 Commons/Settings.qml                            | 4 +++-
 Modules/WallpaperSelector/WallpaperSelector.qml | 1 +
 Widgets/NImageCached.qml                        | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index ea7a2f380..5e7d8192f 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -16,6 +16,7 @@ Singleton {
   property string configDir: Quickshell.env("NOCTALIA_CONFIG_DIR") || (Quickshell.env("XDG_CONFIG_HOME") || Quickshell.env("HOME") + "/.config") + "/" + shellName + "/"
   property string cacheDir: Quickshell.env("NOCTALIA_CACHE_DIR") || (Quickshell.env("XDG_CACHE_HOME") || Quickshell.env("HOME") + "/.cache") + "/" + shellName + "/"
   property string cacheDirImages: cacheDir + "images/"
+  property string cacheDirImagesWallpapers: cacheDir + "images/wallpapers/"
   property string cacheDirImagesNotifications: cacheDir + "images/notifications/"
 
   property string settingsFile: Quickshell.env("NOCTALIA_SETTINGS_FILE") || (configDir + "settings.json")
@@ -203,7 +204,8 @@ Singleton {
     // ensure settings dir exists
     Quickshell.execDetached(["mkdir", "-p", configDir])
     Quickshell.execDetached(["mkdir", "-p", cacheDir])
-    Quickshell.execDetached(["mkdir", "-p", cacheDirImages])
+
+    Quickshell.execDetached(["mkdir", "-p", cacheDirImagesWallpapers])
     Quickshell.execDetached(["mkdir", "-p", cacheDirImagesNotifications])
 
     // Mark directories as created and trigger file loading
diff --git a/Modules/WallpaperSelector/WallpaperSelector.qml b/Modules/WallpaperSelector/WallpaperSelector.qml
index 9676c2ae9..0781c11bb 100644
--- a/Modules/WallpaperSelector/WallpaperSelector.qml
+++ b/Modules/WallpaperSelector/WallpaperSelector.qml
@@ -329,6 +329,7 @@ NPanel {
                   NImageCached {
                     id: img
                     imagePath: wallpaperPath
+                    cacheFolder: Settings.cacheDirImagesWallpapers
                     anchors.fill: parent
                   }
 
diff --git a/Widgets/NImageCached.qml b/Widgets/NImageCached.qml
index 61de0a87d..1343828b9 100644
--- a/Widgets/NImageCached.qml
+++ b/Widgets/NImageCached.qml
@@ -11,8 +11,9 @@ Image {
 
   property string imagePath: ""
   property string imageHash: ""
+  property string cacheFolder: Settings.cacheDirImages
   property int maxCacheDimension: 512
-  readonly property string cachePath: imageHash ? `${Settings.cacheDirImages}${imageHash}@${maxCacheDimension}x${maxCacheDimension}.png` : ""
+  readonly property string cachePath: imageHash ? `${cacheFolder}${imageHash}@${maxCacheDimension}x${maxCacheDimension}.png` : ""
 
   asynchronous: true
   fillMode: Image.PreserveAspectCrop