nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

paths: decode urls

Browse source 
Fixes spaces in paths breaking things
This commit is contained in:
2 * r + 2 * t 2025-07-07 17:58:18 +10:00
parent 3221ca1858
commit 8a6679eace
7 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/Config.qml
View file

@ -19,7 +19,7 @@ Singleton {
property alias paths: adapter.paths
FileView {
path: `${Paths.config}/shell.json`
path: `${Paths.stringify(Paths.config)}/shell.json`
watchChanges: true
onFileChanged: reload()
onAdapterUpdated: writeAdapter()

6
modules/background/Wallpaper.qml
View file

@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
import "root:/widgets"
import "root:/services"
import "root:/config"
import "root:/utils"
import QtQuick
import QtQuick.Dialogs
@ -63,9 +64,10 @@ Item {
FileDialog {
id: dialog
title: qsTr("Select a wallpaper")
acceptLabel: qsTr("Select")
nameFilters: [`Image files (${Wallpapers.extensions.map(e => `*.${e}`).join(" ")})`]
onAccepted: Wallpapers.setWallpaper(selectedFile.toString().replace("file://", ""))
onAccepted: Wallpapers.setWallpaper(Paths.strip(selectedFile))
}
StateLayer {

2
modules/dashboard/dash/User.qml
View file

@ -36,7 +36,7 @@ Row {
id: pfp
anchors.fill: parent
path: `${Paths.home}/.face`
path: `${Paths.stringify(Paths.home)}/.face`
}
MouseArea {

2
modules/lock/Input.qml
View file

@ -43,7 +43,7 @@ ColumnLayout {
CachingImage {
anchors.fill: parent
path: `${Paths.home}/.face`
path: `${Paths.stringify(Paths.home)}/.face`
}
}

2
services/Colours.qml
View file

@ -58,7 +58,7 @@ Singleton {
}
FileView {
path: `${Paths.state}/scheme.json`
path: `${Paths.stringify(Paths.state)}/scheme.json`
watchChanges: true
onFileChanged: reload()
onLoaded: root.load(text(), false)

10
utils/Paths.qml
View file

@ -16,16 +16,20 @@ Singleton {
readonly property url imagecache: `${cache}/imagecache`
function stringify(path: url): string {
return path.toString().replace(/%20/g, " ");
}
function expandTilde(path: string): string {
return strip(path.replace("~", root.home.toString()));
return strip(path.replace("~", stringify(root.home)));
}
function shortenHome(path: string): string {
return path.replace(strip(root.home.toString()), "~");
return path.replace(strip(root.home), "~");
}
function strip(path: url): string {
return path.toString().replace("file://", "");
return stringify(path).replace("file://", "");
}
function mkdir(path: url): void {

4
widgets/CachingImage.qml
View file

@ -8,7 +8,7 @@ Image {
property string path
property string hash
readonly property string cachePath: `${Paths.imagecache}/${hash}@${width}x${height}.png`.slice(7)
readonly property string cachePath: `${Paths.stringify(Paths.imagecache)}/${hash}@${width}x${height}.png`.slice(7)
asynchronous: true
cache: false
@ -16,7 +16,7 @@ Image {
sourceSize.width: width
sourceSize.height: height
onPathChanged: shaProc.exec(["sha256sum", path.replace("file://", "")])
onPathChanged: shaProc.exec(["sha256sum", Paths.strip(path)])
onCachePathChanged: {
if (hash)