kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

wallpaper selector: fix thumbnail generation (#1978, #1902)

Browse Source
This commit is contained in:
end-4
2025-09-17 11:35:42 +02:00
parent cf4aa1256d
commit b984d6794e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/quickshell/ii/modules/common/functions/FileUtils.qml
+3 -1
View File
@@ -10,7 +10,9 @@ Singleton {
* @returns {string} * @returns {string}
*/ */
function trimFileProtocol(str) { function trimFileProtocol(str) {
return str.startsWith("file://") ? str.slice(7) : str; let s = str;
if (typeof s !== "string") s = str.toString(); // Convert to string if it's an url or whatever
return s.startsWith("file://") ? s.slice(7) : s;
} }
/** /**
.config/quickshell/ii/services/Wallpapers.qml
+3 -2
View File
@@ -16,7 +16,7 @@ Singleton {
id: root id: root
property string thumbgenScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/thumbgen.py` property string thumbgenScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/thumbgen.py`
property string generateThumbnailsMagicScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/generate-thumbnails-magick.sh` property string generateThumbnailsMagickScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/generate-thumbnails-magick.sh`
property alias directory: folderModel.folder property alias directory: folderModel.folder
readonly property string effectiveDirectory: FileUtils.trimFileProtocol(folderModel.folder.toString()) readonly property string effectiveDirectory: FileUtils.trimFileProtocol(folderModel.folder.toString())
property url defaultFolder: Qt.resolvedUrl(`${Directories.pictures}/Wallpapers`) property url defaultFolder: Qt.resolvedUrl(`${Directories.pictures}/Wallpapers`)
@@ -136,12 +136,13 @@ Singleton {
// Thumbnail generation // Thumbnail generation
function generateThumbnail(size: string) { function generateThumbnail(size: string) {
// console.log("[Wallpapers] Updating thumbnails")
if (!["normal", "large", "x-large", "xx-large"].includes(size)) throw new Error("Invalid thumbnail size"); if (!["normal", "large", "x-large", "xx-large"].includes(size)) throw new Error("Invalid thumbnail size");
thumbgenProc.directory = root.directory thumbgenProc.directory = root.directory
thumbgenProc.running = false thumbgenProc.running = false
thumbgenProc.command = [ thumbgenProc.command = [
"bash", "-c", "bash", "-c",
`${thumbgenScriptPath} --size ${size} --machine_progress -d ${root.directory} || ${generateThumbnailsMagicScriptPath} --size ${size} -d ${root.directory}`, `${thumbgenScriptPath} --size ${size} --machine_progress -d ${FileUtils.trimFileProtocol(root.directory)} || ${generateThumbnailsMagickScriptPath} --size ${size} -d ${root.directory}`,
] ]
root.thumbnailGenerationProgress = 0 root.thumbnailGenerationProgress = 0
thumbgenProc.running = true thumbgenProc.running = true