Merge branch 'main' into main

retlAairtlA · Apr 23, 2024 · 3fa18a4 · 3fa18a4
2 parents 6348813 + 80f69f3
commit 3fa18a4
Show file tree

Hide file tree

Showing 14 changed files with 1,310 additions and 57 deletions.
diff --git a/forge.config.ts b/forge.config.ts
@@ -20,7 +20,7 @@ const linuxPkgConfig = {
   icon: "images/icon.png",
   genericName: "Games Launcher",
   name: "hydra-launcher",
-  productName: "Hydra"
+  productName: "Hydra",
 };
 
 const config: ForgeConfig = {
@@ -50,10 +50,10 @@ const config: ForgeConfig = {
     }),
     new MakerZIP({}, ["darwin", "linux"]),
     new MakerRpm({
-      options: linuxPkgConfig
+      options: linuxPkgConfig,
     }),
     new MakerDeb({
-      options: linuxPkgConfig
+      options: linuxPkgConfig,
     }),
   ],
   publishers: [

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -77,7 +77,13 @@
     "play": "Play",
     "deleting": "Deleting installer…",
     "close": "Close",
-    "playing_now": "Playing now"
+    "playing_now": "Playing now",
+    "change": "Change",
+    "repacks_modal_description": "Choose the repack you want to download",
+    "downloads_path": "Downloads path",
+    "select_folder_hint": "To change the default folder, access the",
+    "hydra_settings": "Hydra settings",
+    "download_now": "Download now"
   },
   "activation": {
     "title": "Activate Hydra",

diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
@@ -73,7 +73,13 @@
     "not_played_yet": "Você ainda não jogou {{title}}",
     "close": "Fechar",
     "deleting": "Excluindo instalador…",
-    "playing_now": "Jogando agora"
+    "playing_now": "Jogando agora",
+    "change": "Mudar",
+    "repacks_modal_description": "Escolha o repack do jogo que deseja baixar",
+    "downloads_path": "Diretório do download",
+    "select_folder_hint": "Para trocar a pasta padrão, acesse as ",
+    "hydra_settings": "Configurações do Hydra",
+    "download_now": "Baixe agora"
   },
   "activation": {
     "title": "Ativação",

diff --git a/src/main/events/hardware/get-disk-free-space.ts b/src/main/events/hardware/get-disk-free-space.ts
@@ -1,10 +1,11 @@
 import checkDiskSpace from "check-disk-space";
 
 import { registerEvent } from "../register-event";
-import { getDownloadsPath } from "../helpers/get-downloads-path";
 
-const getDiskFreeSpace = async (_event: Electron.IpcMainInvokeEvent) =>
-  checkDiskSpace(await getDownloadsPath());
+const getDiskFreeSpace = async (
+  _event: Electron.IpcMainInvokeEvent,
+  path: string
+) => checkDiskSpace(path);
 
 registerEvent(getDiskFreeSpace, {
   name: "getDiskFreeSpace",

diff --git a/src/main/events/torrenting/start-game-download.ts b/src/main/events/torrenting/start-game-download.ts
@@ -5,7 +5,6 @@ import { GameStatus } from "@main/constants";
 import { registerEvent } from "../register-event";
 
 import type { GameShop } from "@types";
-import { getDownloadsPath } from "../helpers/get-downloads-path";
 import { getImageBase64 } from "@main/helpers";
 import { In } from "typeorm";
 
@@ -14,7 +13,8 @@ const startGameDownload = async (
   repackId: number,
   objectID: string,
   title: string,
-  gameShop: GameShop
+  gameShop: GameShop,
+  downloadPath: string
 ) => {
   const [game, repack] = await Promise.all([
     gameRepository.findOne({
@@ -37,8 +37,6 @@ const startGameDownload = async (
 
   writePipe.write({ action: "pause" });
 
-  const downloadsPath = game?.downloadPath ?? (await getDownloadsPath());
-
   await gameRepository.update(
     {
       status: In([
@@ -57,7 +55,7 @@ const startGameDownload = async (
       },
       {
         status: GameStatus.DownloadingMetadata,
-        downloadPath: downloadsPath,
+        downloadPath: downloadPath,
         repack: { id: repackId },
       }
     );
@@ -66,7 +64,7 @@ const startGameDownload = async (
       action: "start",
       game_id: game.id,
       magnet: repack.magnet,
-      save_path: downloadsPath,
+      save_path: downloadPath,
     });
 
     game.status = GameStatus.DownloadingMetadata;
@@ -75,7 +73,7 @@ const startGameDownload = async (
       action: "start",
       game_id: game.id,
       magnet: repack.magnet,
-      save_path: downloadsPath,
+      save_path: downloadPath,
     });
 
     return game;
@@ -88,15 +86,15 @@ const startGameDownload = async (
       objectID,
       shop: gameShop,
       status: GameStatus.DownloadingMetadata,
-      downloadPath: downloadsPath,
+      downloadPath: downloadPath,
       repack: { id: repackId },
     });
 
     writePipe.write({
       action: "start",
       game_id: createdGame.id,
       magnet: repack.magnet,
-      save_path: downloadsPath,
+      save_path: downloadPath,
     });
 
     const { repack: _, ...rest } = createdGame;

diff --git a/src/preload.ts b/src/preload.ts
@@ -15,8 +15,17 @@ contextBridge.exposeInMainWorld("electron", {
     repackId: number,
     objectID: string,
     title: string,
-    shop: GameShop
-  ) => ipcRenderer.invoke("startGameDownload", repackId, objectID, title, shop),
+    shop: GameShop,
+    downloadPath: string
+  ) =>
+    ipcRenderer.invoke(
+      "startGameDownload",
+      repackId,
+      objectID,
+      title,
+      shop,
+      downloadPath
+    ),
   cancelGameDownload: (gameId: number) =>
     ipcRenderer.invoke("cancelGameDownload", gameId),
   pauseGameDownload: (gameId: number) =>
@@ -90,7 +99,8 @@ contextBridge.exposeInMainWorld("electron", {
   },
 
   /* Hardware */
-  getDiskFreeSpace: () => ipcRenderer.invoke("getDiskFreeSpace"),
+  getDiskFreeSpace: (path: string) =>
+    ipcRenderer.invoke("getDiskFreeSpace", path),
 
   /* Misc */
   getOrCacheImage: (url: string) => ipcRenderer.invoke("getOrCacheImage", url),