Merge branch 'feature/add-download-sources' into feature/game-options-modal

src/main/events/library/delete-game-folder.ts

@@ -34,33 +34,32 @@ const deleteGameFolder = async (
       game.folderName
     );
 
-    if (!fs.existsSync(folderPath)) {
-      await gameRepository.update(
-        { id: gameId },
-        { downloadPath: null, folderName: null }
-      );
-    }
+    if (fs.existsSync(folderPath)) {
+      await new Promise<void>((resolve, reject) => {
+        fs.rm(
+          folderPath,
+          { recursive: true, force: true, maxRetries: 5, retryDelay: 200 },
+          (error) => {
+            if (error) {
+              logger.error(error);
+              reject();
+            }
 
-    return new Promise<void>((resolve, reject) => {
-      fs.rm(
-        folderPath,
-        { recursive: true, force: true, maxRetries: 5, retryDelay: 200 },
-        (error) => {
-          if (error) {
-            logger.error(error);
-            reject();
+            const aria2ControlFilePath = `${folderPath}.aria2`;
+            if (fs.existsSync(aria2ControlFilePath))
+              fs.rmSync(aria2ControlFilePath);
+
+            resolve();
           }
-
-          resolve();
-        }
-      );
-    }).then(async () => {
-      await gameRepository.update(
-        { id: gameId },
-        { downloadPath: null, folderName: null }
-      );
-    });
+        );
+      });
+    }
   }
+
+  await gameRepository.update(
+    { id: gameId },
+    { downloadPath: null, folderName: null, status: null, progress: 0 }
+  );
 };
 
 registerEvent("deleteGameFolder", deleteGameFolder);

src/main/main.ts

@@ -1,12 +1,14 @@
 import { DownloadManager, RepacksManager, startMainLoop } from "./services";
 import {
   downloadQueueRepository,
+  repackRepository,
   userPreferencesRepository,
 } from "./repository";
 import { UserPreferences } from "./entity";
 import { RealDebridClient } from "./services/real-debrid";
 import { fetchDownloadSourcesAndUpdate } from "./helpers";
 import { publishNewRepacksNotifications } from "./services/notifications";
+import { MoreThan } from "typeorm";
 
 startMainLoop();
 
@@ -30,8 +32,16 @@ const loadState = async (userPreferences: UserPreferences | null) => {
   if (nextQueueItem?.game.status === "active")
     DownloadManager.startDownload(nextQueueItem.game);
 
-  fetchDownloadSourcesAndUpdate().then(() => {
-    publishNewRepacksNotifications(300);
+  const now = new Date();
+
+  fetchDownloadSourcesAndUpdate().then(async () => {
+    const newRepacksCount = await repackRepository.count({
+      where: {
+        createdAt: MoreThan(now),
+      },
+    });
+
+    if (newRepacksCount > 0) publishNewRepacksNotifications(newRepacksCount);
   });
 };
 

src/main/services/download-manager.ts

@@ -1,5 +1,7 @@
 import Aria2, { StatusResponse } from "aria2";
 
+import path from "node:path";
+
 import { downloadQueueRepository, gameRepository } from "@main/repository";
 
 import { WindowManager } from "./window-manager";
@@ -67,7 +69,11 @@ export class DownloadManager {
 
   private static getFolderName(status: StatusResponse) {
     if (status.bittorrent?.info) return status.bittorrent.info.name;
-    return "";
+
+    const [file] = status.files;
+    if (file) return path.win32.basename(file.path);
+
+    return null;
   }
 
   private static async getRealDebridDownloadUrl() {
@@ -198,7 +204,7 @@ export class DownloadManager {
     }
 
     if (progress === 1 && this.game && !isDownloadingMetadata) {
-      await publishDownloadCompleteNotification(this.game);
+      publishDownloadCompleteNotification(this.game);
 
       await downloadQueueRepository.delete({ game: this.game });
 
@@ -220,7 +226,9 @@ export class DownloadManager {
         },
       });
 
-      this.resumeDownload(nextQueueItem!.game);
+      if (nextQueueItem) {
+        this.resumeDownload(nextQueueItem.game);
+      }
     }
   }
 
@@ -237,7 +245,7 @@ export class DownloadManager {
     const gid = this.downloads.get(gameId);
 
     if (gid) {
-      await this.aria2.call("remove", gid);
+      await this.aria2.call("forceRemove", gid);
 
       if (this.gid === gid) {
         this.clearCurrentDownload();

src/main/services/notifications.ts

@@ -1,13 +1,40 @@
-import { Notification } from "electron";
+import { Notification, nativeImage } from "electron";
 import { t } from "i18next";
+import { parseICO } from "icojs";
+
 import { Game } from "@main/entity";
-import { userPreferencesRepository } from "@main/repository";
+import { gameRepository, userPreferencesRepository } from "@main/repository";
+
+const getGameIconNativeImage = async (gameId: number) => {
+  try {
+    const game = await gameRepository.findOne({
+      where: {
+        id: gameId,
+      },
+    });
+
+    if (!game?.iconUrl) return undefined;
+
+    const images = await parseICO(
+      Buffer.from(game.iconUrl.split("base64,")[1], "base64")
+    );
+
+    const highResIcon = images.find((image) => image.width >= 128);
+    if (!highResIcon) return undefined;
+
+    return nativeImage.createFromBuffer(Buffer.from(highResIcon.buffer));
+  } catch (err) {
+    return undefined;
+  }
+};
 
 export const publishDownloadCompleteNotification = async (game: Game) => {
   const userPreferences = await userPreferencesRepository.findOne({
     where: { id: 1 },
   });
 
+  const icon = await getGameIconNativeImage(game.id);
+
   if (userPreferences?.downloadNotificationsEnabled) {
     new Notification({
       title: t("download_complete", {
@@ -19,6 +46,7 @@ export const publishDownloadCompleteNotification = async (game: Game) => {
         lng: userPreferences.language,
         title: game.title,
       }),
+      icon,
     }).show();
   }
 };
@@ -28,7 +56,7 @@ export const publishNewRepacksNotifications = async (count: number) => {
     where: { id: 1 },
   });
 
-  if (count > 0 && userPreferences?.repackUpdatesNotificationsEnabled) {
+  if (userPreferences?.repackUpdatesNotificationsEnabled) {
     new Notification({
       title: t("repack_list_updated", {
         ns: "notifications",