Merge branch 'main' into main

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: Build
 
-on:
-  push:
-    branches: main
+on: [pull_request]
 
 jobs:
   build:
@@ -39,7 +37,6 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: yarn build:linux
         env:
-          MAIN_VITE_STEAMGRIDDB_API_KEY: ${{ secrets.STEAMGRIDDB_API_KEY }}
           MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }}
           MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -48,7 +45,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: yarn build:win
         env:
-          MAIN_VITE_STEAMGRIDDB_API_KEY: ${{ secrets.STEAMGRIDDB_API_KEY }}
           MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }}
           MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -58,29 +54,11 @@ jobs:
         with:
           name: Build-${{ matrix.os }}
           path: |
-            dist/*.exe
+            dist/win-unpacked/**
             dist/*.zip
             dist/*.dmg
             dist/*.deb
             dist/*.rpm
             dist/*.tar.gz
             dist/*.yml
             dist/*.blockmap
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: |
-            dist/*.exe
-            dist/*.zip
-            dist/*.dmg
-            dist/*.AppImage
-            dist/*.snap
-            dist/*.deb
-            dist/*.rpm
-            dist/*.tar.gz
-            dist/*.yml
-            dist/*.blockmap
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,70 @@
+name: Build
+
+on:
+  push:
+    branches: main
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.11.1
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      - name: Build with cx_Freeze
+        run: python torrent-client/setup.py build
+
+      - name: Build Linux
+        if: matrix.os == 'ubuntu-latest'
+        run: yarn build:linux
+        env:
+          MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }}
+          MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Windows
+        if: matrix.os == 'windows-latest'
+        run: yarn build:win
+        env:
+          MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }}
+          MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            dist/*.exe
+            dist/*.zip
+            dist/*.dmg
+            dist/*.AppImage
+            dist/*.snap
+            dist/*.deb
+            dist/*.rpm
+            dist/*.tar.gz
+            dist/*.yml
+            dist/*.blockmap
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.husky/pre-commit

@@ -1,2 +1 @@
-yarn lint
-yarn typecheck
+yarn format

.husky/pre-push

@@ -1 +1,2 @@
-yarn format
+yarn lint
+yarn typecheck

.prettierignore

@@ -1,5 +1,6 @@
 out
 dist
+seeds
 pnpm-lock.yaml
 LICENSE.md
 tsconfig.json

electron-builder.yml

@@ -6,6 +6,7 @@ extraResources:
   - hydra-download-manager
   - hydra.db
   - fastlist.exe
+  - seeds
 files:
   - "!**/.vscode/*"
   - "!src/*"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydra",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Hydra",
   "main": "./out/main/index.js",
   "author": "Los Broxas",
@@ -29,7 +29,8 @@
     "build:win": "electron-vite build && electron-builder --win",
     "build:mac": "electron-vite build && electron-builder --mac",
     "build:linux": "electron-vite build && electron-builder --linux",
-    "prepare": "husky"
+    "prepare": "husky",
+    "typeorm:migration-create": "yarn typeorm migration:create"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",

src/main/constants.ts

@@ -18,21 +18,6 @@ export const repackers = [
   "onlinefix",
 ] as const;
 
-export const months = [
-  "Jan",
-  "Feb",
-  "Mar",
-  "Apr",
-  "May",
-  "Jun",
-  "Jul",
-  "Aug",
-  "Sep",
-  "Oct",
-  "Nov",
-  "Dec",
-];
-
 export const defaultDownloadsPath = app.getPath("downloads");
 
 export const databasePath = path.join(
@@ -41,5 +26,6 @@ export const databasePath = path.join(
   "hydra.db"
 );
 
-export const INSTALLATION_ID_LENGTH = 6;
-export const ACTIVATION_KEY_MULTIPLIER = 7;
+export const seedsPath = app.isPackaged
+  ? path.join(process.resourcesPath, "seeds")
+  : path.join(__dirname, "..", "..", "seeds");

src/main/data-source.ts

@@ -1,22 +1,21 @@
 import { DataSource } from "typeorm";
-import {
-  Game,
-  GameShopCache,
-  Repack,
-  UserPreferences,
-  SteamGame,
-} from "@main/entity";
-import type { SqliteConnectionOptions } from "typeorm/driver/sqlite/SqliteConnectionOptions";
+import { Game, GameShopCache, Repack, UserPreferences } from "@main/entity";
+import type { BetterSqlite3ConnectionOptions } from "typeorm/driver/better-sqlite3/BetterSqlite3ConnectionOptions";
 
 import { databasePath } from "./constants";
+import migrations from "./migrations";
 
-export const createDataSource = (options: Partial<SqliteConnectionOptions>) =>
+export const createDataSource = (
+  options: Partial<BetterSqlite3ConnectionOptions>
+) =>
   new DataSource({
     type: "better-sqlite3",
-    database: databasePath,
-    entities: [Game, Repack, UserPreferences, GameShopCache, SteamGame],
+    entities: [Game, Repack, UserPreferences, GameShopCache],
     synchronize: true,
+    database: databasePath,
     ...options,
   });
 
-export const dataSource = createDataSource({});
+export const dataSource = createDataSource({
+  migrations,
+});

src/main/entity/game.entity.ts

@@ -23,8 +23,8 @@ export class Game {
   @Column("text")
   title: string;
 
-  @Column("text")
-  iconUrl: string;
+  @Column("text", { nullable: true })
+  iconUrl: string | null;
 
   @Column("text", { nullable: true })
   folderName: string | null;

src/main/entity/index.ts

@@ -2,4 +2,3 @@ export * from "./game.entity";
 export * from "./repack.entity";
 export * from "./user-preferences.entity";
 export * from "./game-shop-cache.entity";
-export * from "./steam-game.entity";

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

@@ -1,9 +1,10 @@
-import { gameShopCacheRepository, steamGameRepository } from "@main/repository";
+import { gameShopCacheRepository } from "@main/repository";
 import { getSteamAppDetails } from "@main/services";
 
 import type { ShopDetails, GameShop, SteamAppDetails } from "@types";
 
 import { registerEvent } from "../register-event";
+import { stateManager } from "@main/state-manager";
 
 const getLocalizedSteamAppDetails = (
   objectID: string,
@@ -13,10 +14,11 @@ const getLocalizedSteamAppDetails = (
     return getSteamAppDetails(objectID, language);
   }
 
-  return Promise.all([
-    steamGameRepository.findOne({ where: { id: Number(objectID) } }),
-    getSteamAppDetails(objectID, language),
-  ]).then(([steamGame, localizedAppDetails]) => {
+  return getSteamAppDetails(objectID, language).then((localizedAppDetails) => {
+    const steamGame = stateManager
+      .getValue("steamGames")
+      .find((game) => game.id === Number(objectID));
+
     if (steamGame && localizedAppDetails) {
       return {
         ...localizedAppDetails,

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

@@ -3,8 +3,8 @@ import { gameRepository } from "@main/repository";
 import { registerEvent } from "../register-event";
 
 import type { GameShop } from "@types";
-import { getFileBase64 } from "@main/helpers";
-import { getSteamGameIconUrl } from "@main/services";
+import { getFileBase64, getSteamAppAsset } from "@main/helpers";
+import { stateManager } from "@main/state-manager";
 
 const addGameToLibrary = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -27,17 +27,29 @@ const addGameToLibrary = async (
     )
     .then(async ({ affected }) => {
       if (!affected) {
-        const iconUrl = await getFileBase64(
-          await getSteamGameIconUrl(objectID)
-        );
+        const steamGame = stateManager
+          .getValue("steamGames")
+          .find((game) => game.id === Number(objectID));
 
-        await gameRepository.insert({
-          title,
-          iconUrl,
-          objectID,
-          shop: gameShop,
-          executablePath,
-        });
+        const iconUrl = steamGame?.clientIcon
+          ? getSteamAppAsset("icon", objectID, steamGame.clientIcon)
+          : null;
+
+        await gameRepository
+          .insert({
+            title,
+            iconUrl,
+            objectID,
+            shop: gameShop,
+            executablePath,
+          })
+          .then(() => {
+            if (iconUrl) {
+              getFileBase64(iconUrl).then((base64) =>
+                gameRepository.update({ objectID }, { iconUrl: base64 })
+              );
+            }
+          });
       }
     });
 };