Merge branch 'main' into doc/update-readme

README.md

@@ -249,6 +249,13 @@ yarn build:linux
             <br />
             <sub><b>Firdavs</b></sub>
         </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/userMacieG">
+            <img src="https://avatars.githubusercontent.com/u/24211405?v=4" width="100;" alt="userMacieG"/>
+            <br />
+            <sub><b>Maciej Ratyński</b></sub>
+        </a>
     </td></tr>
 </table>
 <!-- readme: contributors -end -->

src/locales/es/translation.json

@@ -15,9 +15,12 @@
     "checking_files": "{{title}} ({{percentage}} - Analizando archivos…)",
     "paused": "{{title}} (Pausado)",
     "downloading": "{{title}} ({{percentage}} - Descargando…)",
-    "filter": "Filtrar biblioteca",
+    "filter": "Buscar en la biblioteca",
+    "follow_us": "Síguenos",
     "home": "Inicio",
-    "follow_us": "Síguenos"
+    "discord": "Únete a nuestro Discord",
+    "x": "Síguenos en X",
+    "github": "Contribuye en GitHub"
   },
   "header": {
     "search": "Buscar",
@@ -45,7 +48,7 @@
     "remove": "Eliminar",
     "remove_from_list": "Quitar",
     "space_left_on_disk": "{{space}} restantes en el disco",
-    "eta": "Finalizando {{eta}}",
+    "eta": "Finalizando en {{eta}}",
     "downloading_metadata": "Descargando metadatos…",
     "checking_files": "Analizando archivos…",
     "filter": "Filtrar repacks",
@@ -55,14 +58,12 @@
     "no_minimum_requirements": "Sin requisitos mínimos para {{title}}",
     "no_recommended_requirements": "{{title}} no tiene requisitos recomendados",
     "paused_progress": "{{progress}} (Pausado)",
-    "release_date": "Fecha de lanzamiento {{date}}",
-    "publisher": "Publicado por {{publisher}}",
+    "release_date": "Fecha de lanzamiento: {{date}}",
+    "publisher": "Publicado por: {{publisher}}",
     "copy_link_to_clipboard": "Copiar enlace",
     "copied_link_to_clipboard": "Enlace copiado",
     "hours": "horas",
     "minutes": "minutos",
-    "amount_hours": "{{amount}} horas",
-    "amount_minutes": "{{amount}} minutos",
     "accuracy": "{{accuracy}}% precisión",
     "add_to_library": "Agregar a la biblioteca",
     "remove_from_library": "Eliminar de la biblioteca",
@@ -75,7 +76,21 @@
     "close": "Cerrar",
     "deleting": "Eliminando instalador…",
     "playing_now": "Jugando ahora",
-    "last_time_played": "Jugado por última vez {{period}}"
+    "last_time_played": "Jugado por última vez {{period}}",
+    "got_it": "Entendido",
+    "change": "Cambiar",
+    "repacks_modal_description": "Selecciona el repack que quieres descargar",
+    "downloads_path": "Ruta de descarga",
+    "select_folder_hint": "Para cambiar la carpeta predeterminada, accede a",
+    "settings": "Ajustes",
+    "download_now": "Descargar ahora",
+    "installation_instructions": "Instrucciones de instalación",
+    "installation_instructions_description": "Se requieren de pasos adicionales para instalar este juego",
+    "online_fix_instruction": "Los juegos de OnlineFix requieren una contraseña para ser extraídos. Cuando se requiera, usa la siguiente contraseña:",
+    "dodi_installation_instruction": "Cuando abras el instalador de DODI, presiona la tecla hacia arriba del teclado <0 /> para iniciar el proceso de instalación:",
+    "dont_show_it_again": "No mostrar de nuevo",
+    "copy_to_clipboard": "Copiar",
+    "copied_to_clipboard": "Copiado"
   },
   "activation": {
     "title": "Activar Hydra",
@@ -88,7 +103,7 @@
   "downloads": {
     "resume": "Resumir",
     "pause": "Pausa",
-    "eta": "Finalizando {{eta}}",
+    "eta": "Finalizando en {{eta}}",
     "paused": "En Pausa",
     "verifying": "Verificando…",
     "completed_at": "Completado el {{date}}",
@@ -103,8 +118,8 @@
     "starting_download": "Iniciando descarga…",
     "remove_from_list": "Eliminar",
     "delete": "Eliminar instalador",
-    "delete_modal_description": "Esto eliminará todos los archivos de instalación de su computadora.",
-    "delete_modal_title": "¿Está seguro?",
+    "delete_modal_description": "Esto eliminará todos los archivos de instalación de tu computadora.",
+    "delete_modal_title": "¿Estás seguro?",
     "deleting": "Eliminando instalador…",
     "install": "Instalar"
   },
@@ -136,6 +151,9 @@
     "description": "Los ejecutables de Wine o Lutris no se encontraron en su sistema",
     "instructions": "Comprueba como instalar de forma correcta uno de los dos en tu distro de Linux para ejecutar el juego con normalidad"
   },
+  "modal": {
+    "close": "Botón de cierre"
+  },
   "catalogue": {
     "next_page": "Siguiente página",
     "previous_page": "Pagina anterior"

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

@@ -11,7 +11,7 @@ const addGameToLibrary = async (
   objectID: string,
   title: string,
   gameShop: GameShop,
-  executablePath: string
+  executablePath: string | null
 ) => {
   const game = await gameRepository.findOne({
     where: {

src/main/events/misc/show-open-dialog.ts

@@ -5,7 +5,11 @@ import { registerEvent } from "../register-event";
 const showOpenDialog = async (
   _event: Electron.IpcMainInvokeEvent,
   options: Electron.OpenDialogOptions
-) => dialog.showOpenDialog(WindowManager.mainWindow, options);
+) => {
+  if (WindowManager.mainWindow) {
+    dialog.showOpenDialog(WindowManager.mainWindow, options);
+  }
+};
 
 registerEvent(showOpenDialog, {
   name: "showOpenDialog",

src/main/index.ts

@@ -85,7 +85,7 @@ app.on("second-instance", (_event, commandLine) => {
     WindowManager.createMainWindow();
   }
 
-  const [, path] = commandLine.pop().split("://");
+  const [, path] = commandLine.pop()?.split("://") ?? [];
   if (path) WindowManager.redirect(path);
 });
 

src/main/services/steam-250.ts

@@ -41,7 +41,8 @@ export const getSteam250List = async () => {
   ).flat();
 
   const gamesMap: Map<string, Steam250Game> = gamesList.reduce((map, item) => {
-    map.set(item.objectID, item);
+    if (item) map.set(item.objectID, item);
+
     return map;
   }, new Map());
 

src/main/services/window-manager.ts

@@ -1,4 +1,4 @@
-import { BrowserWindow, Menu, Notification, Tray, app } from "electron";
+import { BrowserWindow, Menu, Tray, app } from "electron";
 import { is } from "@electron-toolkit/utils";
 import { t } from "i18next";
 import path from "node:path";
@@ -50,15 +50,15 @@ export class WindowManager {
     this.loadURL();
     this.mainWindow.removeMenu();
 
-    const userPreferences = await userPreferencesRepository.findOne({
-      where: { id: 1 },
-    });
-
     this.mainWindow.on("ready-to-show", () => {
       if (!app.isPackaged) WindowManager.mainWindow?.webContents.openDevTools();
     });
 
-    this.mainWindow.on("close", () => {
+    this.mainWindow.on("close", async () => {
+      const userPreferences = await userPreferencesRepository.findOne({
+        where: { id: 1 },
+      });
+
       if (userPreferences?.preferQuitInsteadOfHiding) {
         app.quit();
       }

src/renderer/src/declaration.d.ts

@@ -56,7 +56,7 @@ declare global {
       objectID: string,
       title: string,
       shop: GameShop,
-      executablePath: string
+      executablePath: string | null
     ) => Promise<void>;
     getLibrary: () => Promise<Game[]>;
     getRepackersFriendlyNames: () => Promise<Record<string, string>>;

src/renderer/src/helpers.ts

@@ -24,5 +24,7 @@ export const getSteamLanguage = (language: string) => {
   if (language.startsWith("ru")) return "russian";
   if (language.startsWith("it")) return "italian";
   if (language.startsWith("hu")) return "hungarian";
+  if (language.startsWith("pl")) return "polish";
+
   return "english";
 };

src/renderer/src/pages/downloads/downloads.tsx

@@ -103,6 +103,7 @@ export function Downloads() {
         </>
       );
     }
+
     if (game?.status === "cancelled") return <p>{t("cancelled")}</p>;
     if (game?.status === "downloading_metadata")
       return <p>{t("starting_download")}</p>;
@@ -115,6 +116,8 @@ export function Downloads() {
         </>
       );
     }
+
+    return null;
   };
 
   const openDeleteModal = (gameId: number) => {
@@ -210,6 +213,12 @@ export function Downloads() {
     );
   };
 
+  const handleDeleteGame = () => {
+    if (gameToBeDeleted.current) {
+      deleteGame(gameToBeDeleted.current).then(updateLibrary);
+    }
+  };
+
   return (
     <section className={styles.downloadsContainer}>
       <BinaryNotFoundModal
@@ -219,9 +228,7 @@ export function Downloads() {
       <DeleteModal
         visible={showDeleteModal}
         onClose={() => setShowDeleteModal(false)}
-        deleteGame={() =>
-          deleteGame(gameToBeDeleted.current).then(updateLibrary)
-        }
+        deleteGame={handleDeleteGame}
       />
 
       <TextField placeholder={t("filter")} onChange={handleFilter} />

src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx

@@ -68,7 +68,7 @@ export function HeroPanelActions({
     try {
       if (game) {
         await removeGameFromLibrary(game.id);
-      } else {
+      } else if (gameDetails) {
         const gameExecutablePath = await selectGameExecutable();
 
         await window.electron.addGameToLibrary(
@@ -87,30 +87,37 @@ export function HeroPanelActions({
   };
 
   const openGameInstaller = () => {
-    window.electron.openGameInstaller(game.id).then((isBinaryInPath) => {
-      if (!isBinaryInPath) openBinaryNotFoundModal();
-      updateLibrary();
-    });
+    if (game) {
+      window.electron.openGameInstaller(game.id).then((isBinaryInPath) => {
+        if (!isBinaryInPath) openBinaryNotFoundModal();
+        updateLibrary();
+      });
+    }
   };
 
   const openGame = async () => {
-    if (game.executablePath) {
-      window.electron.openGame(game.id, game.executablePath);
-      return;
-    }
+    if (game) {
+      if (game.executablePath) {
+        window.electron.openGame(game.id, game.executablePath);
+        return;
+      }
 
-    if (game?.executablePath) {
-      window.electron.openGame(game.id, game.executablePath);
-      return;
-    }
+      if (game?.executablePath) {
+        window.electron.openGame(game.id, game.executablePath);
+        return;
+      }
 
-    const gameExecutablePath = await selectGameExecutable();
-    window.electron.openGame(game.id, gameExecutablePath);
+      const gameExecutablePath = await selectGameExecutable();
+      if (gameExecutablePath)
+        window.electron.openGame(game.id, gameExecutablePath);
+    }
   };
 
-  const closeGame = () => window.electron.closeGame(game.id);
+  const closeGame = () => {
+    if (game) window.electron.closeGame(game.id);
+  };
 
-  const deleting = isGameDeleting(game?.id);
+  const deleting = game ? isGameDeleting(game?.id) : false;
 
   const toggleGameOnLibraryButton = (
     <Button
@@ -124,7 +131,7 @@ export function HeroPanelActions({
     </Button>
   );
 
-  if (isGameDownloading) {
+  if (game && isGameDownloading) {
     return (
       <>
         <Button

src/renderer/src/pages/game-details/hero/hero-panel.tsx

@@ -98,7 +98,7 @@ export function HeroPanel({
       return <p>{t("deleting")}</p>;
     }
 
-    if (isGameDownloading) {
+    if (isGameDownloading && gameDownloading?.status) {
       return (
         <>
           <p className={styles.downloadDetailsRow}>
@@ -106,14 +106,14 @@ export function HeroPanel({
             {eta && <small>{t("eta", { eta })}</small>}
           </p>
 
-          {gameDownloading?.status !== "downloading" ? (
+          {gameDownloading.status !== "downloading" ? (
             <>
-              <p>{t(gameDownloading?.status)}</p>
+              <p>{t(gameDownloading.status)}</p>
               {eta && <small>{t("eta", { eta })}</small>}
             </>
           ) : (
             <p className={styles.downloadDetailsRow}>
-              {formatBytes(gameDownloading?.bytesDownloaded)} /{" "}
+              {formatBytes(gameDownloading.bytesDownloaded)} /{" "}
               {finalDownloadSize}
               <small>
                 {numPeers} peers / {numSeeds} seeds
@@ -148,7 +148,7 @@ export function HeroPanel({
         <>
           <p>
             {t("play_time", {
-              amount: formatPlayTime(game.playTimeInMilliseconds),
+              amount: formatPlayTime(),
             })}
           </p>
 

src/renderer/src/pages/game-details/repacks-modal.tsx

@@ -89,7 +89,9 @@ export function RepacksModal({
               <p style={{ color: "#DADBE1" }}>{repack.title}</p>
               <p style={{ fontSize: "12px" }}>
                 {repack.fileSize} - {repackersFriendlyNames[repack.repacker]} -{" "}
-                {format(repack.uploadDate, "dd/MM/yyyy")}
+                {repack.uploadDate
+                  ? format(repack.uploadDate, "dd/MM/yyyy")
+                  : ""}
               </p>
             </Button>
           ))}