Merge pull request #1857 from hydralauncher/fix/use-local-achievement-cache

fix: achievements on library page

Author: thegrannychaseroperation

python_rpc/main.py

@@ -153,8 +153,11 @@ def profile_image():
     data = request.get_json()
     image_path = data.get('image_path')
 
+    # use webp as default value for target_extension
+    target_extension = data.get('target_extension') or 'webp'
+
     try:
-        processed_image_path, mime_type = ProfileImageProcessor.process_image(image_path)
+        processed_image_path, mime_type = ProfileImageProcessor.process_image(image_path, target_extension)
         return jsonify({'imagePath': processed_image_path, 'mimeType': mime_type}), 200
     except Exception as e:
         return jsonify({"error": str(e)}), 400

python_rpc/profile_image_processor.py

@@ -4,7 +4,7 @@
 class ProfileImageProcessor:
 
     @staticmethod
-    def get_parsed_image_data(image_path):
+    def get_parsed_image_data(image_path, target_extension):
         Image.MAX_IMAGE_PIXELS = 933120000
 
         image = Image.open(image_path)
@@ -16,7 +16,7 @@ def get_parsed_image_data(image_path):
             return image_path, mime_type
         else:
             new_uuid = str(uuid.uuid4())
-            new_image_path = os.path.join(tempfile.gettempdir(), new_uuid) + ".webp"
+            new_image_path = os.path.join(tempfile.gettempdir(), new_uuid) + "." + target_extension
             image.save(new_image_path)
 
             new_image = Image.open(new_image_path)
@@ -26,5 +26,5 @@ def get_parsed_image_data(image_path):
 
 
     @staticmethod
-    def process_image(image_path):
-        return ProfileImageProcessor.get_parsed_image_data(image_path)
+    def process_image(image_path, target_extension):
+        return ProfileImageProcessor.get_parsed_image_data(image_path, target_extension)

src/main/events/library/get-library.ts

@@ -2,6 +2,7 @@ import type { LibraryGame } from "@types";
 import { registerEvent } from "../register-event";
 import {
   downloadsSublevel,
+  gameAchievementsSublevel,
   gamesShopAssetsSublevel,
   gamesSublevel,
 } from "@main/level";
@@ -18,11 +19,20 @@ const getLibrary = async (): Promise<LibraryGame[]> => {
             const download = await downloadsSublevel.get(key);
             const gameAssets = await gamesShopAssetsSublevel.get(key);
 
+            let unlockedAchievementCount = game.unlockedAchievementCount ?? 0;
+
+            if (!game.unlockedAchievementCount) {
+              const achievements = await gameAchievementsSublevel.get(key);
+
+              unlockedAchievementCount =
+                achievements?.unlockedAchievements.length ?? 0;
+            }
+
             return {
               id: key,
               ...game,
               download: download ?? null,
-              unlockedAchievementCount: game.unlockedAchievementCount ?? 0,
+              unlockedAchievementCount,
               achievementCount: game.achievementCount ?? 0,
               // Spread gameAssets last to ensure all image URLs are properly set
               ...gameAssets,

src/main/events/profile/process-profile-image.ts

@@ -1,16 +1,20 @@
 import { registerEvent } from "../register-event";
 import { PythonRPC } from "@main/services/python-rpc";
 
-const processProfileImage = async (
+const processProfileImageEvent = async (
   _event: Electron.IpcMainInvokeEvent,
   path: string
 ) => {
+  return processProfileImage(path, "webp");
+};
+
+export const processProfileImage = async (path: string, extension?: string) => {
   return PythonRPC.rpc
     .post<{
       imagePath: string;
       mimeType: string;
-    }>("/profile-image", { image_path: path })
+    }>("/profile-image", { image_path: path, target_extension: extension })
     .then((response) => response.data);
 };
 
-registerEvent("processProfileImage", processProfileImage);
+registerEvent("processProfileImage", processProfileImageEvent);

src/main/services/notifications/index.ts

@@ -15,6 +15,13 @@ import { db, levelKeys, themesSublevel } from "@main/level";
 import { restartAndInstallUpdate } from "@main/events/autoupdater/restart-and-install-update";
 import { SystemPath } from "../system-path";
 import { getThemeSoundPath } from "@main/helpers";
+import { processProfileImage } from "@main/events/profile/process-profile-image";
+
+const getStaticImage = async (path: string) => {
+  return processProfileImage(path, "jpg")
+    .then((response) => response.imagePath)
+    .catch(() => path);
+};
 
 async function downloadImage(url: string | null) {
   if (!url) return undefined;
@@ -31,8 +38,9 @@ async function downloadImage(url: string | null) {
   response.data.pipe(writer);
 
   return new Promise<string | undefined>((resolve) => {
-    writer.on("finish", () => {
-      resolve(outputPath);
+    writer.on("finish", async () => {
+      const staticImagePath = await getStaticImage(outputPath);
+      resolve(staticImagePath);
     });
     writer.on("error", () => {
       logger.error("Failed to download image", { url });

src/main/services/ws/events/friend-request.ts

@@ -8,9 +8,11 @@ export const friendRequestEvent = async (payload: FriendRequest) => {
     friendRequestCount: payload.friendRequestCount,
   });
 
-  const user = await HydraApi.get(`/users/${payload.senderId}`);
+  if (payload.senderId) {
+    const user = await HydraApi.get(`/users/${payload.senderId}`);
 
-  if (user) {
-    publishNewFriendRequestNotification(user);
+    if (user) {
+      publishNewFriendRequestNotification(user);
+    }
   }
 };

src/renderer/src/pages/library/library-game-card-large.tsx

@@ -1,7 +1,7 @@
 import { LibraryGame } from "@types";
 import { useGameCard } from "@renderer/hooks";
 import { ClockIcon, AlertFillIcon, TrophyIcon } from "@primer/octicons-react";
-import { memo, useMemo } from "react";
+import { memo, useEffect, useMemo, useState } from "react";
 import "./library-game-card-large.scss";
 
 interface LibraryGameCardLargeProps {
@@ -48,6 +48,20 @@ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
     ]
   );
 
+  const [unlockedAchievementsCount, setUnlockedAchievementsCount] = useState(
+    game.unlockedAchievementCount ?? 0
+  );
+
+  useEffect(() => {
+    if (game.unlockedAchievementCount) return;
+
+    window.electron
+      .getUnlockedAchievements(game.objectId, game.shop)
+      .then((achievements) => {
+        setUnlockedAchievementsCount(achievements.length);
+      });
+  }, [game]);
+
   const backgroundStyle = useMemo(
     () =>
       backgroundImage ? { backgroundImage: `url(${backgroundImage})` } : {},
@@ -56,9 +70,9 @@ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
 
   const achievementBarStyle = useMemo(
     () => ({
-      width: `${((game.unlockedAchievementCount ?? 0) / (game.achievementCount ?? 1)) * 100}%`,
+      width: `${(unlockedAchievementsCount / (game.achievementCount ?? 1)) * 100}%`,
     }),
-    [game.unlockedAchievementCount, game.achievementCount]
+    [unlockedAchievementsCount, game.achievementCount]
   );
 
   const logoImage = game.customLogoImageUrl ?? game.logoImageUrl;
@@ -116,14 +130,12 @@ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
                     className="library-game-card-large__achievement-trophy"
                   />
                   <span className="library-game-card-large__achievement-count">
-                    {game.unlockedAchievementCount ?? 0} /{" "}
-                    {game.achievementCount ?? 0}
+                    {unlockedAchievementsCount} / {game.achievementCount ?? 0}
                   </span>
                 </div>
                 <span className="library-game-card-large__achievement-percentage">
                   {Math.round(
-                    ((game.unlockedAchievementCount ?? 0) /
-                      (game.achievementCount ?? 1)) *
+                    (unlockedAchievementsCount / (game.achievementCount ?? 1)) *
                       100
                   )}
                   %

src/renderer/src/pages/library/library.tsx

@@ -14,10 +14,6 @@ import "./library.scss";
 
 export default function Library() {
   const { library, updateLibrary } = useLibrary();
-  type ElectronAPI = {
-    refreshLibraryAssets?: () => Promise<unknown>;
-    onLibraryBatchComplete?: (cb: () => void) => () => void;
-  };
 
   const [viewMode, setViewMode] = useState<ViewMode>(() => {
     const savedViewMode = localStorage.getItem("library-view-mode");
@@ -41,22 +37,15 @@ export default function Library() {
 
   useEffect(() => {
     dispatch(setHeaderTitle(t("library")));
-    const electron = (globalThis as unknown as { electron?: ElectronAPI })
-      .electron;
-    let unsubscribe: () => void = () => undefined;
-    if (electron?.refreshLibraryAssets) {
-      electron
-        .refreshLibraryAssets()
-        .then(() => updateLibrary())
-        .catch(() => updateLibrary());
-      if (electron.onLibraryBatchComplete) {
-        unsubscribe = electron.onLibraryBatchComplete(() => {
-          updateLibrary();
-        });
-      }
-    } else {
+
+    const unsubscribe = window.electron.onLibraryBatchComplete(() => {
       updateLibrary();
-    }
+    });
+
+    window.electron
+      .refreshLibraryAssets()
+      .then(() => updateLibrary())
+      .catch(() => updateLibrary());
 
     return () => {
       unsubscribe();