Merge branch 'main' into feat/improving-sources

src/main/events/catalogue/get-game-assets.ts

@@ -6,6 +6,10 @@ import { gamesShopAssetsSublevel, levelKeys } from "@main/level";
 const LOCAL_CACHE_EXPIRATION = 1000 * 60 * 60 * 8; // 8 hours
 
 export const getGameAssets = async (objectId: string, shop: GameShop) => {
+  if (shop === "custom") {
+    return null;
+  }
+
   const cachedAssets = await gamesShopAssetsSublevel.get(
     levelKeys.game(shop, objectId)
   );

src/main/events/catalogue/get-game-shop-details.ts

@@ -26,6 +26,8 @@ const getGameShopDetails = async (
   shop: GameShop,
   language: string
 ): Promise<ShopDetailsWithAssets | null> => {
+  if (shop === "custom") return null;
+
   if (shop === "steam") {
     const [cachedData, cachedAssets] = await Promise.all([
       gamesShopCacheSublevel.get(

src/main/events/catalogue/get-game-stats.ts

@@ -10,6 +10,10 @@ const getGameStats = async (
   objectId: string,
   shop: GameShop
 ) => {
+  if (shop === "custom") {
+    return null;
+  }
+
   const cachedStats = await gamesStatsCacheSublevel.get(
     levelKeys.game(shop, objectId)
   );

src/main/events/library/add-game-to-favorites.ts

@@ -13,7 +13,9 @@ const addGameToFavorites = async (
   const game = await gamesSublevel.get(gameKey);
   if (!game) return;
 
-  HydraApi.put(`/profile/games/${shop}/${objectId}/favorite`).catch(() => {});
+  if (shop !== "custom") {
+    HydraApi.put(`/profile/games/${shop}/${objectId}/favorite`).catch(() => {});
+  }
 
   try {
     await gamesSublevel.put(gameKey, {

src/main/events/library/remove-game-from-favorites.ts

@@ -13,7 +13,11 @@ const removeGameFromFavorites = async (
   const game = await gamesSublevel.get(gameKey);
   if (!game) return;
 
-  HydraApi.put(`/profile/games/${shop}/${objectId}/unfavorite`).catch(() => {});
+  if (shop !== "custom") {
+    HydraApi.put(`/profile/games/${shop}/${objectId}/unfavorite`).catch(
+      () => {}
+    );
+  }
 
   try {
     await gamesSublevel.put(gameKey, {

src/main/events/library/remove-game-from-library.ts

@@ -84,7 +84,7 @@ const removeGameFromLibrary = async (
     await resetShopAssets(gameKey);
   }
 
-  if (game?.remoteId) {
+  if (game.remoteId) {
     HydraApi.delete(`/profile/games/${game.remoteId}`).catch(() => {});
   }
 

src/main/services/achievements/get-game-achievement-data.ts

@@ -27,6 +27,10 @@ export const getGameAchievementData = async (
   shop: GameShop,
   useCachedData: boolean
 ) => {
+  if (shop === "custom") {
+    return [];
+  }
+
   const gameKey = levelKeys.game(shop, objectId);
 
   const cachedAchievements = await gameAchievementsSublevel.get(gameKey);

src/main/services/process-watcher.ts

@@ -1,10 +1,10 @@
 import { WindowManager } from "./window-manager";
 import { createGame, updateGamePlaytime } from "./library-sync";
-import type { Game, GameRunning } from "@types";
+import type { Game, GameRunning, UserPreferences } from "@types";
 import { PythonRPC } from "./python-rpc";
 import axios from "axios";
 import { ProcessPayload } from "./download/types";
-import { gamesSublevel, levelKeys } from "@main/level";
+import { db, gamesSublevel, levelKeys } from "@main/level";
 import { CloudSync } from "./cloud-sync";
 import { logger } from "./logger";
 import path from "path";
@@ -209,6 +209,17 @@ function onOpenGame(game: Game) {
     lastSyncTick: now,
   });
 
+  // Hide Hydra to tray on game startup if enabled
+  db.get<string, UserPreferences | null>(levelKeys.userPreferences, {
+    valueEncoding: "json",
+  })
+    .then((userPreferences) => {
+      if (userPreferences?.hideToTrayOnGameStart) {
+        WindowManager.mainWindow?.hide();
+      }
+    })
+    .catch(() => {});
+
   if (game.remoteId) {
     updateGamePlaytime(
       game,

src/main/services/window-manager.ts

@@ -462,6 +462,7 @@ export class WindowManager {
 
       editorWindow.once("ready-to-show", () => {
         editorWindow.show();
+        this.mainWindow?.webContents.openDevTools();
         if (!app.isPackaged || isStaging) {
           editorWindow.webContents.openDevTools();
         }
@@ -469,11 +470,12 @@ export class WindowManager {
 
       editorWindow.webContents.on("before-input-event", (_event, input) => {
         if (input.key === "F12") {
-          editorWindow.webContents.toggleDevTools();
+          this.mainWindow?.webContents.toggleDevTools();
         }
       });
 
       editorWindow.on("close", () => {
+        this.mainWindow?.webContents.closeDevTools();
         this.editorWindows.delete(themeId);
       });
     }