fix: show icon from config on shelf

Author: srg-kostyrko

apps/player-desktop/src/app/open-game-button.tsx

@@ -20,9 +20,7 @@ export const OpenGameButton: React.FC = () => {
       try {
         const imported = await importDesktop(filePath as string);
         for (const entry of imported) {
-          if (!games$.value[entry.id]) {
-            games$.actions.add(entry.id, entry);
-          }
+          games$.actions.add(entry.id, entry);
         }
         goToGame(imported[0].id);
       } catch (err) {

apps/player/src/app/open-game-button.tsx

@@ -14,10 +14,9 @@ export const OpenGameButton: React.FC = () => {
       const content = evt.target?.result as ArrayBuffer;
       try {
         const imported = await importFile(file.name, content);
+        console.log(imported);
         for (const entry of imported) {
-          if (!games$.value[entry.id]) {
-            games$.actions.add(entry.id, entry);
-          }
+          games$.actions.add(entry.id, entry);
         }
         const toRun = imported[0].id;
         toRun && goToGame(toRun);

libs/game-shelf/src/components/main.css

@@ -336,7 +336,7 @@ h6 {
   align-items: center;
 }
 .game-shelf__card-title img {
-  max-width: 120px;
+  max-width: 60px;
   margin-right: var(--spacer--sm);
 }
 .game-shelf__card-content {

libs/game-state/src/importer/archive-importer.ts

@@ -44,6 +44,11 @@ export async function importArchive(
     return Promise.all(
       games.map(async (game) => {
         const file = game.file.slice(game.file.lastIndexOf('/') + 1);
+        const loadConfig = await storage.prepareLoadConfig(game.id, file);
+        let icon = game.resources?.icon;
+        if (icon) {
+          icon = `${loadConfig.url}${icon}`;
+        }
         return {
           id: game.id,
           mode: game.mode,
@@ -52,8 +57,9 @@ export async function importArchive(
           ported_by: game.ported_by,
           version: game.version,
           description: game.description,
+          icon,
           loadConfig: {
-            ...(await storage.prepareLoadConfig(game.id, file)),
+            ...loadConfig,
             descriptor: game,
           },
         };
@@ -69,6 +75,11 @@ export async function importArchive(
       const descriptorContent = stringify({ game: [rootDescriptor] } as unknown as JsonMap);
       await storage$.value?.addGameResource(game_id, GAME_DESCRIPTOR_NAME, new TextEncoder().encode(descriptorContent));
     }
+    const loadConfig = await storage.prepareLoadConfig(game_id, filename);
+    let icon = rootDescriptor?.resources?.icon;
+    if (icon) {
+      icon = `${loadConfig.url}${icon}`;
+    }
     return [
       {
         id: game_id,
@@ -78,7 +89,8 @@ export async function importArchive(
         ported_by: rootDescriptor?.ported_by,
         version: rootDescriptor?.version,
         description: rootDescriptor?.description,
-        loadConfig: await storage.prepareLoadConfig(game_id, filename),
+        icon,
+        loadConfig,
       },
     ];
   }