move toPlainObject to object_utils.js

This commit is contained in:
end-4
2025-05-10 21:23:20 +02:00
parent 8031625af7
commit b05049dedf
2 changed files with 34 additions and 30 deletions
@@ -0,0 +1,29 @@
function trimFileProtocol(str) {
return str.startsWith("file://") ? str.slice(7) : str;
}
function toPlainObject(qtObj) {
if (qtObj === null || typeof qtObj !== "object") return qtObj;
// Handle arrays
if (Array.isArray(qtObj)) {
return qtObj.map(toPlainObject);
}
const result = ({});
for (let key in qtObj) {
if (
typeof qtObj[key] !== "function" &&
!key.startsWith("objectName") &&
!key.startsWith("children") &&
!key.startsWith("object") &&
!key.startsWith("parent") &&
!key.startsWith("metaObject") &&
!key.startsWith("destroyed") &&
!key.startsWith("reloadableId")
) {
result[key] = toPlainObject(qtObj[key]);
}
}
return result;
}
+5 -30
View File
@@ -2,6 +2,8 @@ pragma Singleton
pragma ComponentBehavior: Bound
import "root:/modules/common"
import "root:/modules/common/functions/file_utils.js" as FileUtils
import "root:/modules/common/functions/object_utils.js" as ObjectUtils
import QtQuick
import Quickshell
import Quickshell.Io
@@ -12,35 +14,9 @@ Singleton {
id: root
property string fileDir: `${StandardPaths.standardLocations(StandardPaths.ConfigLocation)[0]}/illogical-impulse`
property string fileName: "config.json"
property string filePath: `${root.fileDir}/${root.fileName}`
property string filePath: FileUtils.trimFileProtocol(`${root.fileDir}/${root.fileName}`)
property bool firstLoad: true
function toPlainObject(qtObj) {
if (qtObj === null || typeof qtObj !== "object") return qtObj;
// Handle arrays
if (Array.isArray(qtObj)) {
return qtObj.map(toPlainObject);
}
const result = ({});
for (let key in qtObj) {
if (
typeof qtObj[key] !== "function" &&
!key.startsWith("objectName") &&
!key.startsWith("children") &&
!key.startsWith("object") &&
!key.startsWith("parent") &&
!key.startsWith("metaObject") &&
!key.startsWith("destroyed") &&
!key.startsWith("reloadableId")
) {
result[key] = toPlainObject(qtObj[key]);
}
}
return result;
}
function loadConfig() {
configFileView.reload()
}
@@ -94,7 +70,7 @@ Singleton {
FileView {
id: configFileView
path: root.filePath
path: Qt.resolvedUrl(root.filePath)
watchChanges: true
onFileChanged: {
console.log("[ConfigLoader] File changed, reloading...")
@@ -108,8 +84,7 @@ Singleton {
onLoadFailed: (error) => {
if(error == FileViewError.FileNotFound) {
console.log("[ConfigLoader] File not found, creating new file.")
// Apply ConfigOptions json to file
const plainConfig = toPlainObject(ConfigOptions)
const plainConfig = ObjectUtils.toPlainObject(ConfigOptions)
configFileView.setText(JSON.stringify(plainConfig, null, 2))
Hyprland.dispatch(`exec notify-send "Shell configuration created" "${root.filePath}"`)
} else {