Merge branch 'main' into feat/update-lastTimePlayed-column

src/main/events/autoupdater/check-for-updates.ts

@@ -1,41 +1,27 @@
 import { AppUpdaterEvents } from "@types";
 import { registerEvent } from "../register-event";
-import updater, { ProgressInfo, UpdateInfo } from "electron-updater";
+import updater, { UpdateInfo } from "electron-updater";
 import { WindowManager } from "@main/services";
 import { app } from "electron";
 
 const { autoUpdater } = updater;
 
 const sendEvent = (event: AppUpdaterEvents) => {
-  WindowManager.splashWindow?.webContents.send("autoUpdaterEvent", event);
+  WindowManager.mainWindow?.webContents.send("autoUpdaterEvent", event);
 };
 
 const mockValuesForDebug = async () => {
-  sendEvent({ type: "update-downloaded" });
+  sendEvent({ type: "update-available", info: { version: "1.3.0" } });
+  // sendEvent({ type: "update-downloaded" });
 };
 
 const checkForUpdates = async (_event: Electron.IpcMainInvokeEvent) => {
   autoUpdater
-    .addListener("error", () => {
-      sendEvent({ type: "error" });
-    })
-    .addListener("checking-for-update", () => {
-      sendEvent({ type: "checking-for-updates" });
-    })
-    .addListener("update-not-available", () => {
-      sendEvent({ type: "update-not-available" });
-    })
     .addListener("update-available", (info: UpdateInfo) => {
       sendEvent({ type: "update-available", info });
     })
     .addListener("update-downloaded", () => {
       sendEvent({ type: "update-downloaded" });
-    })
-    .addListener("download-progress", (info: ProgressInfo) => {
-      sendEvent({ type: "download-progress", info });
-    })
-    .addListener("update-cancelled", () => {
-      sendEvent({ type: "update-cancelled" });
     });
 
   if (app.isPackaged) {

src/main/events/autoupdater/continue-to-main-window.ts

@@ -1,12 +0,0 @@
-import { WindowManager } from "@main/services";
-import { registerEvent } from "../register-event";
-import updater from "electron-updater";
-
-const { autoUpdater } = updater;
-
-const continueToMainWindow = async (_event: Electron.IpcMainInvokeEvent) => {
-  autoUpdater.removeAllListeners();
-  WindowManager.prepareMainWindowAndCloseSplash();
-};
-
-registerEvent("continueToMainWindow", continueToMainWindow);

src/main/events/autoupdater/restart-and-install-update.ts

@@ -1,16 +1,13 @@
 import { app } from "electron";
 import { registerEvent } from "../register-event";
 import updater from "electron-updater";
-import { WindowManager } from "@main/services";
 
 const { autoUpdater } = updater;
 
 const restartAndInstallUpdate = async (_event: Electron.IpcMainInvokeEvent) => {
+  autoUpdater.removeAllListeners();
   if (app.isPackaged) {
     autoUpdater.quitAndInstall(true, true);
-  } else {
-    autoUpdater.removeAllListeners();
-    WindowManager.prepareMainWindowAndCloseSplash();
   }
 };
 

src/main/events/index.ts

@@ -29,7 +29,6 @@ import "./user-preferences/update-user-preferences";
 import "./user-preferences/auto-launch";
 import "./autoupdater/check-for-updates";
 import "./autoupdater/restart-and-install-update";
-import "./autoupdater/continue-to-main-window";
 
 ipcMain.handle("ping", () => "pong");
 ipcMain.handle("getVersion", () => app.getVersion());

src/main/index.ts

@@ -64,7 +64,7 @@ app.whenReady().then(() => {
       where: { id: 1 },
     });
 
-    WindowManager.createSplashScreen();
+    WindowManager.createMainWindow();
     WindowManager.createSystemTray(userPreferences?.language || "en");
   });
 });

src/main/services/window-manager.ts

@@ -17,9 +17,6 @@ import { IsNull, Not } from "typeorm";
 
 export class WindowManager {
   public static mainWindow: Electron.BrowserWindow | null = null;
-  public static splashWindow: Electron.BrowserWindow | null = null;
-  public static isReadyToShowMainWindow = false;
-  private static isMainMaximized = false;
 
   private static loadURL(hash = "") {
     // HMR for renderer base on electron-vite cli.
@@ -38,48 +35,8 @@ export class WindowManager {
     }
   }
 
-  private static loadSplashURL() {
-    // HMR for renderer base on electron-vite cli.
-    // Load the remote URL for development or the local html file for production.
-    if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
-      this.splashWindow?.loadURL(
-        `${process.env["ELECTRON_RENDERER_URL"]}#/splash`
-      );
-    } else {
-      this.splashWindow?.loadFile(
-        path.join(__dirname, "../renderer/index.html"),
-        {
-          hash: "splash",
-        }
-      );
-    }
-  }
-
-  public static createSplashScreen() {
-    if (this.splashWindow) return;
-
-    this.splashWindow = new BrowserWindow({
-      width: 380,
-      height: 380,
-      frame: false,
-      resizable: false,
-      backgroundColor: "#1c1c1c",
-      webPreferences: {
-        preload: path.join(__dirname, "../preload/index.mjs"),
-        sandbox: false,
-      },
-    });
-
-    this.loadSplashURL();
-    this.splashWindow.removeMenu();
-    if (this.splashWindow?.isMaximized()) {
-      this.splashWindow?.unmaximize(); 
-      this.isMainMaximized = true;
-    }
-  }
-
   public static createMainWindow() {
-    if (this.mainWindow || !this.isReadyToShowMainWindow) return;
+    if (this.mainWindow) return;
 
     this.mainWindow = new BrowserWindow({
       width: 1200,
@@ -104,7 +61,6 @@ export class WindowManager {
 
     this.loadURL();
     this.mainWindow.removeMenu();
-    if (this.isMainMaximized) this.mainWindow?.maximize();
 
     this.mainWindow.on("ready-to-show", () => {
       if (!app.isPackaged) WindowManager.mainWindow?.webContents.openDevTools();
@@ -123,12 +79,6 @@ export class WindowManager {
     });
   }
 
-  public static prepareMainWindowAndCloseSplash() {
-    this.isReadyToShowMainWindow = true;
-    this.splashWindow?.close();
-    this.createMainWindow();
-  }
-
   public static redirect(hash: string) {
     if (!this.mainWindow) this.createMainWindow();
     this.loadURL(hash);