Merge branch 'main' into feature/seed-completed-downloads

src/main/events/catalogue/get-how-long-to-beat.ts

@@ -1,16 +1,16 @@
 import type { GameShop, HowLongToBeatCategory } from "@types";
-import { HydraApi } from "@main/services";
 
 import { registerEvent } from "../register-event";
+import { HydraApi } from "@main/services";
 
 const getHowLongToBeat = async (
   _event: Electron.IpcMainInvokeEvent,
-  shop: GameShop,
-  objectId: string
+  objectId: string,
+  shop: GameShop
 ): Promise<HowLongToBeatCategory[] | null> => {
   const params = new URLSearchParams({
+    objectId,
     shop,
-    objectId: objectId.toString(),
   });
 
   return HydraApi.get(`/games/how-long-to-beat?${params.toString()}`, null, {

src/main/events/index.ts

@@ -1,4 +1,4 @@
-import { appVersion, defaultDownloadsPath } from "@main/constants";
+import { appVersion, defaultDownloadsPath, isStaging } from "@main/constants";
 import { ipcMain } from "electron";
 
 import "./catalogue/get-catalogue";
@@ -74,5 +74,6 @@ import "./misc/show-item-in-folder";
 
 ipcMain.handle("ping", () => "pong");
 ipcMain.handle("getVersion", () => appVersion);
+ipcMain.handle("isStaging", () => isStaging);
 ipcMain.handle("isPortableVersion", () => isPortableVersion());
 ipcMain.handle("getDefaultDownloadsPath", () => defaultDownloadsPath);

src/main/events/library/close-game.ts

@@ -25,7 +25,11 @@ const closeGame = async (
   if (!game) return;
 
   const gameProcess = processes.find((runningProcess) => {
-    return runningProcess.exe === game.executablePath;
+    if (process.platform === "linux") {
+      return runningProcess.name === game.executablePath?.split("/").at(-1);
+    } else {
+      return runningProcess.exe === game.executablePath;
+    }
   });
 
   if (gameProcess) {

src/main/events/library/select-game-wine-prefix.ts

@@ -5,9 +5,9 @@ import { registerEvent } from "../register-event";
 const selectGameWinePrefix = async (
   _event: Electron.IpcMainInvokeEvent,
   id: number,
-  winePrefixPath: string
+  winePrefixPath: string | null
 ) => {
-  return gameRepository.update({ id }, { winePrefixPath });
+  return gameRepository.update({ id }, { winePrefixPath: winePrefixPath });
 };
 
 registerEvent("selectGameWinePrefix", selectGameWinePrefix);

src/main/events/library/update-executable-path.ts

@@ -6,14 +6,18 @@ import { parseExecutablePath } from "../helpers/parse-executable-path";
 const updateExecutablePath = async (
   _event: Electron.IpcMainInvokeEvent,
   id: number,
-  executablePath: string
+  executablePath: string | null
 ) => {
+  const parsedPath = executablePath
+    ? parseExecutablePath(executablePath)
+    : null;
+
   return gameRepository.update(
     {
       id,
     },
     {
-      executablePath: parseExecutablePath(executablePath),
+      executablePath: parsedPath,
     }
   );
 };

src/main/events/torrenting/start-game-download.ts

@@ -1,6 +1,6 @@
 import { registerEvent } from "../register-event";
 import type { StartGameDownloadPayload } from "@types";
-import { DownloadManager, HydraApi, logger } from "@main/services";
+import { DownloadManager, HydraApi } from "@main/services";
 
 import { Not } from "typeorm";
 import { steamGamesWorker } from "@main/workers";
@@ -76,24 +76,23 @@ const startGameDownload = async (
       },
     });
 
-    createGame(updatedGame!).catch(() => {});
-
-    HydraApi.post(
-      "/games/download",
-      {
-        objectId: updatedGame!.objectID,
-        shop: updatedGame!.shop,
-      },
-      { needsAuth: false }
-    ).catch((err) => {
-      logger.error("Failed to create game download", err);
-    });
-
     await DownloadManager.cancelDownload(updatedGame!.id);
     await DownloadManager.startDownload(updatedGame!);
 
     await downloadQueueRepository.delete({ game: { id: updatedGame!.id } });
     await downloadQueueRepository.insert({ game: { id: updatedGame!.id } });
+
+    await Promise.all([
+      createGame(updatedGame!).catch(() => {}),
+      HydraApi.post(
+        "/games/download",
+        {
+          objectId: updatedGame!.objectID,
+          shop: updatedGame!.shop,
+        },
+        { needsAuth: false }
+      ).catch(() => {}),
+    ]);
   });
 };
 

src/main/events/user/get-unlocked-achievements.ts

@@ -1,6 +1,9 @@
 import type { GameShop, UnlockedAchievement, UserAchievement } from "@types";
 import { registerEvent } from "../register-event";
-import { gameAchievementRepository } from "@main/repository";
+import {
+  gameAchievementRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 import { getGameAchievementData } from "@main/services/achievements/get-game-achievement-data";
 
 export const getUnlockedAchievements = async (
@@ -12,10 +15,17 @@ export const getUnlockedAchievements = async (
     where: { objectId, shop },
   });
 
+  const userPreferences = await userPreferencesRepository.findOne({
+    where: { id: 1 },
+  });
+
+  const showHiddenAchievementsDescription =
+    userPreferences?.showHiddenAchievementsDescription || false;
+
   const achievementsData = await getGameAchievementData(
     objectId,
     shop,
-    useCachedData
+    useCachedData ? cachedAchievements : null
   );
 
   const unlockedAchievements = JSON.parse(
@@ -50,6 +60,10 @@ export const getUnlockedAchievements = async (
         unlocked: false,
         unlockTime: null,
         icongray: icongray,
+        description:
+          !achievementData.hidden || showHiddenAchievementsDescription
+            ? achievementData.description
+            : undefined,
       } as UserAchievement;
     })
     .sort((a, b) => {