Fix/464 (#469)

* refactor: update MainSettings accessors for improved encapsulation and consistency

* fix: #464, fix incorrect event name for opening manga in same window

Author: mienaiyami

src/electron/ipc/update.ts

@@ -5,11 +5,11 @@ import { WindowManager } from "../util/window";
 import { ipc } from "./utils";
 
 export const registerUpdateHandlers = (): void => {
-    if (MainSettings.getSettings().checkForUpdates) {
+    if (MainSettings.settings.checkForUpdates) {
         const mainWindow = WindowManager.getAllWindows()[0];
         if (mainWindow) {
             const check = () => {
-                const settings = MainSettings.getSettings();
+                const settings = MainSettings.settings;
                 checkForUpdate(mainWindow.id, settings.channel, settings.skipPatch, false, settings.autoDownload);
             };
             check();
@@ -19,6 +19,6 @@ export const registerUpdateHandlers = (): void => {
 
     ipc.on("update:check:manual", (e, { promptAfterCheck = true }) => {
         const windowId = getWindowFromWebContents(e.sender).id;
-        checkForUpdate(windowId, MainSettings.getSettings().channel, false, promptAfterCheck, false);
+        checkForUpdate(windowId, MainSettings.settings.channel, false, promptAfterCheck, false);
     });
 };

src/electron/main.ts

@@ -42,10 +42,10 @@ if (app.isPackaged) {
     app.on("second-instance", (_event, commandLine) => {
         if (commandLine.length >= 3) {
             // for file explorer option
-            if (MainSettings.getSettings().openInExistingWindow) {
+            if (MainSettings.settings.openInExistingWindow) {
                 const window = BrowserWindow.getAllWindows().at(-1);
                 if (window) {
-                    window.webContents.send("loadMangaFromLink", { link: commandLine[2] });
+                    window.webContents.send("reader:loadLink", { link: commandLine[2] });
                     window.show();
                 } else {
                     log.error("Could not get the window.");

src/electron/util/mainSettings.ts

@@ -28,7 +28,7 @@ const oldTempPath = path.join(app.getPath("userData"), "TEMP_PATH");
 const oldOpenInExistingWindowPath = path.join(app.getPath("userData"), "OPEN_IN_EXISTING_WINDOW");
 
 export class MainSettings {
-    private static settings: MainSettingsType;
+    private static _settings: MainSettingsType;
     private static readonly settingsPath = path.join(app.getPath("userData"), "main-settings.json");
 
     private static makeMainSettingsJson(): MainSettingsType {
@@ -64,19 +64,19 @@ export class MainSettings {
         }
     }
 
-    public static getSettings(): MainSettingsType {
-        return { ...MainSettings.settings };
+    public static get settings(): MainSettingsType {
+        return { ...MainSettings._settings };
     }
 
     public static async updateSettings(newSettings: Partial<MainSettingsType>): Promise<void> {
-        MainSettings.settings = mainSettingsSchema.parse({ ...MainSettings.settings, ...newSettings });
-        await fs.promises.writeFile(MainSettings.settingsPath, JSON.stringify(MainSettings.settings, null, 2));
-        MainSettings.applySettings(MainSettings.settings);
+        MainSettings._settings = mainSettingsSchema.parse({ ...MainSettings._settings, ...newSettings });
+        await fs.promises.writeFile(MainSettings.settingsPath, JSON.stringify(MainSettings._settings, null, 2));
+        MainSettings.applySettings(MainSettings._settings);
     }
 
     public static initialize(): void {
-        MainSettings.settings = MainSettings.parseMainSettings();
-        MainSettings.applySettings(MainSettings.settings);
+        MainSettings._settings = MainSettings.parseMainSettings();
+        MainSettings.applySettings(MainSettings._settings);
         MainSettings.registerIpcHandlers();
     }
 
@@ -111,12 +111,12 @@ export class MainSettings {
     }
 
     private static registerIpcHandlers(): void {
-        ipc.handle("mainSettings:get", () => MainSettings.getSettings());
+        ipc.handle("mainSettings:get", () => MainSettings.settings);
         ipc.handle("mainSettings:update", async (_, newSettings: Partial<MainSettingsType>) => {
             await MainSettings.updateSettings(newSettings);
             const windows = WindowManager.getAllWindows();
             windows.forEach((window) => {
-                ipc.send(window.webContents, "mainSettings:sync", MainSettings.getSettings());
+                ipc.send(window.webContents, "mainSettings:sync", MainSettings.settings);
             });
             // return this.getSettings();
         });

src/electron/util/window.ts

@@ -127,7 +127,7 @@ export class WindowManager {
         const closeEvent = async (e: Electron.Event) => {
             e.preventDefault();
             let res = 1;
-            if (MainSettings.getSettings().askBeforeClosing) {
+            if (MainSettings.settings.askBeforeClosing) {
                 res = dialog.showMessageBoxSync(window, {
                     message: "Close this window?",
                     title: "Yomikiru",

src/renderer/features/settings/components/FileExplorerOptions.tsx

@@ -47,7 +47,6 @@ const FileExplorerOptions = (): ReactElement => {
                     onChange={handleOpenInSameWindowChange}
                     labelAfter="Open In Existing Window"
                 />
-                <code>App Restart Needed</code>
             </div>
             <ul>
                 <li>