Skip to content

fix: start with the default window rules when windows.json is empty or broken #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattchristenson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: start with the default window rules when windows.json is empty or broken #579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion lib/shared/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ export class ConfigManager extends GObject.Object {
const defaultContents = this.loadFileContents(defaultFile);
Logger.trace(defaultContents);
createdStream.write_all(defaultContents, null);
// close it, or the file can stay empty (#415)
createdStream.close(null);
}
}
}
Expand Down Expand Up @@ -137,7 +139,29 @@ export class ConfigManager extends GObject.Object {
if (success) {
const windowConfigContents = imports.byteArray.toString(contents);
Logger.trace(`${windowConfigContents}`);
windowProps = JSON.parse(windowConfigContents);
try {
windowProps = JSON.parse(windowConfigContents);
if (!Array.isArray(windowProps?.overrides)) throw new Error("no overrides list");
} catch (e) {
// An empty or broken file mustn't stop Forge from starting (#415): use the default
// rules. Forge rewrites the file on the next change of the rules (e.g. a window closing),
// so keep a copy of it first.
let backup = "";
if (windowConfigContents.trim()) {
try {
const backupFile = Gio.File.new_for_path(`${windowConfigFile.get_path()}.bak`);
windowConfigFile.copy(backupFile, Gio.FileCopyFlags.OVERWRITE, null, null);
backup = `; it was copied to ${backupFile.get_path()}`;
} catch (copyError) {
backup = `; it couldn't be copied (${copyError.message})`;
}
}
console.warn(
`Forge: ${windowConfigFile.get_path()} is not valid (${e.message}); ` +
`using the default window rules${backup}`
);
windowProps = this.loadDefaultWindowConfigContents();
}
}
return windowProps;
}
Expand Down