fix: small bugs

arleypadua · Dec 6, 2024 · 7c2d05f · 7c2d05f
1 parent 887a865
commit 7c2d05f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/PKHeX.Facade/Repositories/FormRepository.cs b/src/PKHeX.Facade/Repositories/FormRepository.cs
@@ -5,9 +5,18 @@ namespace PKHeX.Facade.Repositories;
 
 public static class FormRepository
 {
-    public static IEnumerable<FormDefinition> GetFor(Species species, EntityContext context) =>
-        FormConverter.GetFormList((ushort)species, GameInfo.Strings.types, GameInfo.Strings.forms, [], context)
-            .Select((form, index) => new FormDefinition((ushort)index, form));
+    public static IEnumerable<FormDefinition> GetFor(Species species, EntityContext context)
+    {
+        try
+        {
+            return FormConverter.GetFormList((ushort)species, GameInfo.Strings.types, GameInfo.Strings.forms, [], context)
+                .Select((form, index) => new FormDefinition((ushort)index, form));
+        }
+        catch (ArgumentOutOfRangeException)
+        {
+            return Array.Empty<FormDefinition>();
+        }
+    }
 
     public static IEnumerable<FormDefinition> GetFor(PKM pokemon) =>
         GetFor((Species)pokemon.Species, pokemon.Context);

diff --git a/src/PKHeX.Facade/Repositories/ItemRepository.cs b/src/PKHeX.Facade/Repositories/ItemRepository.cs
@@ -30,11 +30,11 @@ public ItemRepository(SaveFile saveFile)
     }
 
     public ISet<ItemDefinition> GameItems => _gameItems.Values.ToHashSet();
-    public ItemDefinition GetGameItem(ushort id) => _gameItems[id];
+    public ItemDefinition GetGameItem(ushort id) => _gameItems.GetValueOrDefault(id) ?? ItemDefinition.Unknown(id);
     public ItemDefinition? GetGameItemByName(string name) => _gameItems.Values
         .FirstOrDefault(i => i.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
 
-    public static ItemDefinition GetItem(ushort id) => AllItemsById[id];
+    public static ItemDefinition GetItem(ushort id) => AllItemsById.GetValueOrDefault(id) ?? ItemDefinition.Unknown(id);
     public static ItemDefinition? GetItemByName(string name) => AllItemsById.Values
         .FirstOrDefault(i => i.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
     public static ISet<ItemDefinition> AllBalls() => AllBallsById.Values.ToHashSet();
@@ -46,4 +46,6 @@ public record ItemDefinition(ushort Id, string Name)
     public static readonly int None = 0;
 
     public bool IsNone => Id == None;
+
+    public static ItemDefinition Unknown(ushort id) => new(id, $"Unknown Item {id}");
 }
diff --git a/src/PKHeX.Web/_js/lib/files/files.ts b/src/PKHeX.Web/_js/lib/files/files.ts
@@ -2,7 +2,7 @@ import {ContentStreamReference} from "../blazor/types.ts";
 
 export async function downloadFileFromStream(fileName: string, contentStreamReference: ContentStreamReference) {
     const arrayBuffer = await contentStreamReference.arrayBuffer();
-    const blob = new Blob([arrayBuffer]);
+    const blob = new Blob([arrayBuffer], {type: 'application/octet-stream'});
     const url = URL.createObjectURL(blob);
     const anchorElement = document.createElement('a');
     anchorElement.href = url;