Merge pull request #1311 from hydralauncher/feat/achievements-points

feat: achievements points
hydralauncher · Dec 23, 2024 · dfb50e9 · dfb50e9
2 parents c0f35c5 + 017954b
commit dfb50e9
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 138 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hydralauncher",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "description": "Hydra",
   "main": "./out/main/index.js",
   "author": "Los Broxas",

diff --git a/python_rpc/http_downloader.py b/python_rpc/http_downloader.py
@@ -34,7 +34,7 @@ def get_download_status(self):
         download = self.aria2.get_download(self.download.gid)
 
         response = {
-            'folderName': str(download.dir) + "/" + download.name,
+            'folderName': download.name,
             'fileSize': download.total_length,
             'progress': download.completed_length / download.total_length if download.total_length else 0,
             'downloadSpeed': download.download_speed,

diff --git a/python_rpc/main.py b/python_rpc/main.py
@@ -124,8 +124,6 @@ def action():
     action = data.get('action')
     game_id = data.get('game_id')
 
-    print(data)
-
     if action == 'start':
         url = data.get('url')
 

diff --git a/resources/tray-icon.png b/resources/tray-icon.png
diff --git a/src/main/events/cloud-save/get-game-artifacts.ts b/src/main/events/cloud-save/get-game-artifacts.ts
@@ -1,6 +1,7 @@
 import { HydraApi } from "@main/services";
 import { registerEvent } from "../register-event";
 import type { GameArtifact, GameShop } from "@types";
+import { SubscriptionRequiredError } from "@shared";
 
 const getGameArtifacts = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -13,8 +14,16 @@ const getGameArtifacts = async (
   });
 
   return HydraApi.get<GameArtifact[]>(
-    `/profile/games/artifacts?${params.toString()}`
-  );
+    `/profile/games/artifacts?${params.toString()}`,
+    {},
+    { needsSubscription: true }
+  ).catch((err) => {
+    if (err instanceof SubscriptionRequiredError) {
+      return [];
+    }
+
+    throw err;
+  });
 };
 
 registerEvent("getGameArtifacts", getGameArtifacts);
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -9,7 +9,6 @@ import { RealDebridClient } from "./services/download/real-debrid";
 import { HydraApi } from "./services/hydra-api";
 import { uploadGamesBatch } from "./services/library-sync";
 import { Aria2 } from "./services/aria2";
-import { PythonRPC } from "./services/python-rpc";
 
 const loadState = async (userPreferences: UserPreferences | null) => {
   import("./events");
@@ -43,11 +42,7 @@ const loadState = async (userPreferences: UserPreferences | null) => {
     },
   });
 
-  if (nextQueueItem?.game.status === "active") {
-    DownloadManager.startRPC(nextQueueItem.game, seedList);
-  } else {
-    PythonRPC.spawn();
-  }
+  await DownloadManager.startRPC(nextQueueItem?.game, seedList);
 
   startMainLoop();
 };

diff --git a/src/main/services/download/download-manager.ts b/src/main/services/download/download-manager.ts
@@ -24,23 +24,19 @@ import { logger } from "../logger";
 export class DownloadManager {
   private static downloadingGameId: number | null = null;
 
-  public static startRPC(game: Game, initialSeeding?: Game[]) {
-    if (game && game.status === "active") {
-      PythonRPC.spawn(
-        {
-          game_id: game.id,
-          url: game.uri!,
-          save_path: game.downloadPath!,
-        },
-        initialSeeding?.map((game) => ({
-          game_id: game.id,
-          url: game.uri!,
-          save_path: game.downloadPath!,
-        }))
-      );
+  public static async startRPC(game?: Game, initialSeeding?: Game[]) {
+    PythonRPC.spawn(
+      game?.status === "active"
+        ? await this.getDownloadPayload(game).catch(() => undefined)
+        : undefined,
+      initialSeeding?.map((game) => ({
+        game_id: game.id,
+        url: game.uri!,
+        save_path: game.downloadPath!,
+      }))
+    );
 
-      this.downloadingGameId = game.id;
-    }
+    this.downloadingGameId = game?.id ?? null;
   }
 
   private static async getDownloadStatus() {
@@ -226,7 +222,9 @@ export class DownloadManager {
 
     WindowManager.mainWindow?.setProgressBar(-1);
 
-    this.downloadingGameId = null;
+    if (gameId === this.downloadingGameId) {
+      this.downloadingGameId = null;
+    }
   }
 
   static async resumeSeeding(game: Game) {
@@ -245,64 +243,66 @@ export class DownloadManager {
     });
   }
 
-  static async startDownload(game: Game) {
+  private static async getDownloadPayload(game: Game) {
     switch (game.downloader) {
       case Downloader.Gofile: {
         const id = game!.uri!.split("/").pop();
 
         const token = await GofileApi.authorize();
         const downloadLink = await GofileApi.getDownloadLink(id!);
 
-        await PythonRPC.rpc.post("/action", {
+        return {
           action: "start",
           game_id: game.id,
           url: downloadLink,
-          save_path: game.downloadPath,
+          save_path: game.downloadPath!,
           header: `Cookie: accountToken=${token}`,
-        });
-        break;
+        };
       }
       case Downloader.PixelDrain: {
         const id = game!.uri!.split("/").pop();
 
-        await PythonRPC.rpc.post("/action", {
+        return {
           action: "start",
           game_id: game.id,
           url: `https://pixeldrain.com/api/file/${id}?download`,
-          save_path: game.downloadPath,
-        });
-        break;
+          save_path: game.downloadPath!,
+        };
       }
       case Downloader.Qiwi: {
         const downloadUrl = await QiwiApi.getDownloadUrl(game.uri!);
 
-        await PythonRPC.rpc.post("/action", {
+        return {
           action: "start",
           game_id: game.id,
           url: downloadUrl,
-          save_path: game.downloadPath,
-        });
-        break;
+          save_path: game.downloadPath!,
+        };
       }
       case Downloader.Torrent:
-        await PythonRPC.rpc.post("/action", {
+        return {
           action: "start",
           game_id: game.id,
-          url: game.uri,
-          save_path: game.downloadPath,
-        });
-        break;
+          url: game.uri!,
+          save_path: game.downloadPath!,
+        };
       case Downloader.RealDebrid: {
         const downloadUrl = await RealDebridClient.getDownloadUrl(game.uri!);
 
-        await PythonRPC.rpc.post("/action", {
+        return {
           action: "start",
           game_id: game.id,
-          url: downloadUrl,
-          save_path: game.downloadPath,
-        });
+          url: downloadUrl!,
+          save_path: game.downloadPath!,
+        };
       }
     }
+  }
+
+  static async startDownload(game: Game) {
+    const payload = await this.getDownloadPayload(game);
+
+    await PythonRPC.rpc.post("/action", payload);
 
     this.downloadingGameId = game.id;
   }

diff --git a/src/renderer/src/pages/achievements/achievement-list.tsx b/src/renderer/src/pages/achievements/achievement-list.tsx
@@ -18,8 +18,12 @@ export function AchievementList({ achievements }: AchievementListProps) {
 
   return (
     <ul className={styles.list}>
-      {achievements.map((achievement, index) => (
-        <li key={index} className={styles.listItem} style={{ display: "flex" }}>
+      {achievements.map((achievement) => (
+        <li
+          key={achievement.name}
+          className={styles.listItem}
+          style={{ display: "flex" }}
+        >
           <img
             className={styles.listItemImage({
               unlocked: achievement.unlocked,
@@ -72,7 +76,7 @@ export function AchievementList({ achievements }: AchievementListProps) {
                 <p style={{ fontSize: "1.1em" }}>???</p>
               </button>
             )}
-            {achievement.unlockTime && (
+            {achievement.unlockTime != null && (
               <div
                 title={t("unlocked_at", {
                   date: formatDateTime(achievement.unlockTime),

diff --git a/src/renderer/src/pages/game-details/sidebar/sidebar.tsx b/src/renderer/src/pages/game-details/sidebar/sidebar.tsx
@@ -154,7 +154,7 @@ export function Sidebar() {
                   <div>
                     <p>{achievement.displayName}</p>
                     <small>
-                      {achievement.unlockTime &&
+                      {achievement.unlockTime != null &&
                         formatDateTime(achievement.unlockTime)}
                     </small>
                   </div>
@@ -203,7 +203,7 @@ export function Sidebar() {
                   <div>
                     <p>{achievement.displayName}</p>
                     <small>
-                      {achievement.unlockTime &&
+                      {achievement.unlockTime != null &&
                         formatDateTime(achievement.unlockTime)}
                     </small>
                   </div>

diff --git a/src/renderer/src/pages/settings/settings-download-sources.tsx b/src/renderer/src/pages/settings/settings-download-sources.tsx
@@ -13,8 +13,7 @@ import { settingsContext } from "@renderer/context";
 import { downloadSourcesTable } from "@renderer/dexie";
 import { downloadSourcesWorker } from "@renderer/workers";
 import { useNavigate } from "react-router-dom";
-import { clearFilters } from "@renderer/features";
-import { setFilters } from "@renderer/features";
+import { setFilters, clearFilters } from "@renderer/features";
 
 export function SettingsDownloadSources() {
   const [showAddDownloadSourceModal, setShowAddDownloadSourceModal] =

diff --git a/src/renderer/src/pages/shared-modals/hydra-cloud/hydra-cloud-modal.css.ts b/src/renderer/src/pages/shared-modals/hydra-cloud/hydra-cloud-modal.css.ts
diff --git a/src/shared/index.ts b/src/shared/index.ts
@@ -13,7 +13,7 @@ export class UserNotLoggedInError extends Error {
 export class SubscriptionRequiredError extends Error {
   constructor() {
     super("user does not have hydra cloud subscription");
-    this.name = "UserWithoutCloudSubscriptionError";
+    this.name = "SubscriptionRequiredError";
   }
 }