Olivier/colorshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

💥 fix(scripts/config): can't assign values because entries are frozen

Browse Source
This commit is contained in:
retrozinndev
2025-06-25 16:09:01 -03:00
parent 86a9481b78
commit 312ff9ec5a
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ags/scripts/config.ts
+16 -19
View File
@@ -48,7 +48,7 @@ class Config extends GObject.Object implements Subscribable {
private readonly defaultFile = Gio.File.new_for_path( private readonly defaultFile = Gio.File.new_for_path(
`${GLib.get_user_config_dir()}/colorshell/config.json`); `${GLib.get_user_config_dir()}/colorshell/config.json`);
/** Frozen-object(immutable) with default entries. User-values are stored /** unmodified object with default entries. User-values are stored
* in the `entries` field */ * in the `entries` field */
public readonly defaults: ConfigEntries = { public readonly defaults: ConfigEntries = {
notifications: { notifications: {
@@ -82,8 +82,6 @@ class Config extends GObject.Object implements Subscribable {
constructor(filePath?: (Gio.File|string)) { constructor(filePath?: (Gio.File|string)) {
super(); super();
Object.freeze(this.defaults);
this.#file = (typeof filePath === "string") ? this.#file = (typeof filePath === "string") ?
Gio.File.new_for_path(filePath) Gio.File.new_for_path(filePath)
: (filePath ?? this.defaultFile); : (filePath ?? this.defaultFile);
@@ -173,6 +171,14 @@ class Config extends GObject.Object implements Subscribable {
} }
this.notifySubs(); this.notifySubs();
}).catch((e: Gio.IOErrorEnum) => {
Notifications.getDefault().sendNotification({
urgency: AstalNotifd.Urgency.NORMAL,
appName: "colorshell",
summary: "Config read error",
body: `An error occurred while reading colorshell's config file: \nFile: ${`${
this.#file.get_path()!}\n${e.message ? `${e.message}\n` : ""}${e.stack}`.replace(/[<>]/g, "\\&")}`
});
}); });
} }
@@ -195,35 +201,26 @@ class Config extends GObject.Object implements Subscribable {
return this._getProperty(path, this.defaults, expectType); return this._getProperty(path, this.defaults, expectType);
} }
private _getProperty(propertyPath: string, entries: ConfigEntries, expectType?: ValueTypes): (any|undefined) { private _getProperty(path: string, entries: ConfigEntries, expectType?: ValueTypes): (any|undefined) {
let property: any = entries; let property: any = entries;
const pathArray = propertyPath.split('.').filter(str => str); const pathArray = path.split('.').filter(str => str);
for(let i = 0; i < pathArray.length; i++) { for(let i = 0; i < pathArray.length; i++) {
const path = propertyPath[i]; const currentPath = pathArray[i];
if(i < pathArray.length-2 && property?.[path] === undefined) { property = property[currentPath as keyof typeof property];
console.error(`Config: property with path \`${
pathArray.filter((_, idx) => idx <= i).join('.')
}\` either could not be found in config entries or its value is \`undefined\`, returning default value`);
property = undefined;
break;
}
property = property[path as keyof typeof property];
} }
if(expectType !== "any" && typeof property !== expectType) { if(expectType !== "any" && typeof property !== expectType) {
console.error(`Config: property with path \`${propertyPath console.error(`Config: property with path \`${path
}\` is either \`undefined\` or not in the expected value type \`${expectType }\` is either \`undefined\` or not in the expected value type \`${expectType
}\`, returning default value`); }\`, returning default value`);
property = this.getPropertyDefault(propertyPath); property = this.getPropertyDefault(path);
} }
if(expectType !== "any" && typeof property !== expectType) { if(expectType !== "any" && typeof property !== expectType) {
console.error(`Config: property with path \`${propertyPath}\` not found in defaults/user-entries, returning \`undefined\``); console.error(`Config: property with path \`${path}\` not found in defaults/user-entries, returning \`undefined\``);
property = undefined; property = undefined;
} }