Code cleanup, renaming, etc.

codemonkey85 · Feb 26, 2025 · ec9ecfe · ec9ecfe
1 parent bb3a915
commit ec9ecfe
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 44 deletions.
diff --git a/Pkmds.Web/Components/EditForms/PokemonEditForm.razor b/Pkmds.Web/Components/EditForms/PokemonEditForm.razor
@@ -22,7 +22,7 @@
                    Class="my-2"
                    StartIcon="@Icons.Material.Filled.Delete"
                    title="Delete Pokémon"
-                   Disabled="@(Pokemon.Species == (ushort)Species.None)">
+                   Disabled="@(Pokemon.Species.IsInvalidSpecies())">
             Delete
         </MudButton>
 
@@ -34,7 +34,7 @@
                    Color="@Color.Primary"
                    Size="@Size.Small"
                    title="Save Pokémon"
-                   Disabled="@(Pokemon.Species == (ushort)Species.None)">
+                   Disabled="@(Pokemon.Species.IsInvalidSpecies())">
             Save
         </MudButton>
 
@@ -46,7 +46,7 @@
                    Color="@Color.Default"
                    Size="@Size.Small"
                    title="Copy Pokémon"
-                   Disabled="@(Pokemon.Species == (ushort)Species.None)">
+                   Disabled="@(Pokemon.Species.IsInvalidSpecies())">
             Copy
         </MudButton>
 
@@ -70,7 +70,7 @@
                    Color="@Color.Default"
                    Size="@Size.Small"
                    title="Export Pokémon as Showdown"
-                   Disabled="@(Pokemon.Species == (ushort)Species.None)">
+                   Disabled="@(Pokemon.Species.IsInvalidSpecies())">
             Showdown
         </MudButton>
 

diff --git a/Pkmds.Web/Components/EditForms/PokemonEditForm.razor.cs b/Pkmds.Web/Components/EditForms/PokemonEditForm.razor.cs
@@ -47,10 +47,10 @@ void OnDeleteConfirm(bool confirmed)
             var selectedPokemonType = AppService.GetSelectedPokemonSlot(out var partySlot, out var boxNumber, out var boxSlot);
             switch (selectedPokemonType)
             {
-                case Services.AppService.SelectedPokemonType.Party:
+                case SelectedPokemonType.Party:
                     AppService.DeletePokemon(partySlot);
                     break;
-                case Services.AppService.SelectedPokemonType.Box:
+                case SelectedPokemonType.Box:
                     AppService.DeletePokemon(boxNumber, boxSlot);
                     break;
             }
@@ -76,7 +76,7 @@ private void OnClickPaste()
             return;
         }
 
-        if (Pokemon is { Species: > (int)Species.None })
+        if ((Pokemon?.Species).IsValidSpecies())
         {
             ShowPasteConfirmation();
         }
@@ -124,10 +124,10 @@ void PastePokemon()
             var selectedPokemonType = AppService.GetSelectedPokemonSlot(out var partySlot, out var boxNumber, out var boxSlot);
             switch (selectedPokemonType)
             {
-                case Services.AppService.SelectedPokemonType.Party:
+                case SelectedPokemonType.Party:
                     AppService.SetSelectedPartyPokemon(Pokemon, partySlot);
                     break;
-                case Services.AppService.SelectedPokemonType.Box:
+                case SelectedPokemonType.Box:
                     AppService.SetSelectedBoxPokemon(Pokemon, boxNumber, boxSlot);
                     break;
             }

diff --git a/Pkmds.Web/Components/EditForms/Tabs/MainTab.razor b/Pkmds.Web/Components/EditForms/Tabs/MainTab.razor
@@ -43,7 +43,7 @@
                      SearchFunc="@SearchPokemonNames"
                      ToStringFunc="@(species => species?.Text)"/>
 
-    if (Pokemon != saveFile.BlankPKM && Pokemon.Species != (ushort)Species.None)
+    if (Pokemon != saveFile.BlankPKM && Pokemon.Species.IsValidSpecies())
     {
         @TypeSummary(Pokemon.GetGenerationTypes())
     }

diff --git a/Pkmds.Web/Components/Layout/MainLayout.razor.cs b/Pkmds.Web/Components/Layout/MainLayout.razor.cs
@@ -282,9 +282,9 @@ private async Task ExportSelectedPokemon()
         AppState.ShowProgressIndicator = false;
     }
 
-    private byte[] GetPokemonFileData(PKM? pokemon) 
+    private byte[] GetPokemonFileData(PKM? pokemon)
     {
-        if (pokemon is null) 
+        if (pokemon is null)
         {
             return [];
         }

diff --git a/Pkmds.Web/Components/MainTabPages/BadgesComponent.razor.cs b/Pkmds.Web/Components/MainTabPages/BadgesComponent.razor.cs
@@ -1,5 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace Pkmds.Web.Components.MainTabPages;
 
 public partial class BadgesComponent : IDisposable

diff --git a/Pkmds.Web/Components/MainTabPages/MysteryGiftDatabaseTab.razor b/Pkmds.Web/Components/MainTabPages/MysteryGiftDatabaseTab.razor
@@ -8,7 +8,7 @@
                    ShowNextButton/>
 
     <MudSelect T="int"
-               @bind-Value="pageSize"
+               @bind-Value="itemsPerPage"
                @bind-Value:after="OnPageSizeChange"
                Label="Items per page">
         @foreach (var pageSize in pagesSizes)
@@ -70,7 +70,7 @@
                                        Color="@Color.Default"
                                        Size="@Size.Small"
                                        title="Copy Pokémon"
-                                       Disabled="@(mysteryGift.Species == (ushort)Species.None)">
+                                       Disabled="@(mysteryGift.Species.IsInvalidSpecies())">
                                 Copy
                             </MudButton>
                             <MudButton OnClick="@(() => OnClickImport(mysteryGift))"
@@ -80,7 +80,7 @@
                                        Color="@Color.Default"
                                        Size="@Size.Small"
                                        title="Import Card"
-                                       Disabled="@(mysteryGift.Species == (ushort)Species.None)">
+                                       Disabled="@(mysteryGift.Species.IsInvalidSpecies())">
                                 Import
                             </MudButton>
                         </MudCardActions>

diff --git a/Pkmds.Web/Components/MainTabPages/MysteryGiftDatabaseTab.razor.cs b/Pkmds.Web/Components/MainTabPages/MysteryGiftDatabaseTab.razor.cs
@@ -9,10 +9,10 @@ public partial class MysteryGiftDatabaseTab
 
     private List<MysteryGift> paginatedItems = [];
     private int currentPage = 1;
-    private int pageSize = 20; // Number of items per page
+    private int itemsPerPage = 20; // Number of items per page
     private readonly int[] pagesSizes = [10, 20, 50, 100];
 
-    private int TotalPages => (int)Math.Ceiling((double)mysteryGiftsList.Count / pageSize);
+    private int TotalPages => (int)Math.Ceiling((double)mysteryGiftsList.Count / itemsPerPage);
 
     protected override void OnInitialized()
     {
@@ -33,10 +33,10 @@ private void LoadData()
         {
             encounterDatabase = saveFile switch
             {
-                SAV9SV sav9sv => encounterDatabase.Where(IsPresent(sav9sv.Personal)),
-                SAV8SWSH sav8swsh => encounterDatabase.Where(IsPresent(sav8swsh.Personal)),
-                SAV8BS sav8bs => encounterDatabase.Where(IsPresent(sav8bs.Personal)),
-                SAV8LA sav8la => encounterDatabase.Where(IsPresent(sav8la.Personal)),
+                SAV9SV sav9Sv => encounterDatabase.Where(IsPresent(sav9Sv.Personal)),
+                SAV8SWSH sav8Swsh => encounterDatabase.Where(IsPresent(sav8Swsh.Personal)),
+                SAV8BS sav8Bs => encounterDatabase.Where(IsPresent(sav8Bs.Personal)),
+                SAV8LA sav8La => encounterDatabase.Where(IsPresent(sav8La.Personal)),
                 SAV7b => encounterDatabase.Where(mysteryGift => mysteryGift is WB7),
                 SAV7 => encounterDatabase.Where(mysteryGift => mysteryGift.Generation < 7 || mysteryGift is WC7),
                 _ => encounterDatabase.Where(mysteryGift => mysteryGift.Generation <= saveFile.Generation),
@@ -56,9 +56,12 @@ static Func<MysteryGift, bool> IsPresent<TTable>(TTable personalTable) where TTa
             mysteryGift => personalTable.IsPresentInGame(mysteryGift.Species, mysteryGift.Form);
     }
 
-    private void UpdatePaginatedItems() => paginatedItems = [.. mysteryGiftsList
-        .Skip((currentPage - 1) * pageSize)
-        .Take(pageSize)];
+    private void UpdatePaginatedItems() => paginatedItems =
+    [
+        .. mysteryGiftsList
+            .Skip((currentPage - 1) * itemsPerPage)
+            .Take(itemsPerPage)
+    ];
 
     private void GoToPage() => UpdatePaginatedItems();
 
@@ -103,7 +106,9 @@ private async Task OnClickImport(MysteryGift mysteryGift)
         }
 
         await AppService.ImportMysteryGift(dataMysteryGift, out var isSuccessful, out var resultsMessage);
-        Snackbar.Add(resultsMessage, isSuccessful ? MudBlazor.Severity.Success : MudBlazor.Severity.Error);
+        Snackbar.Add(resultsMessage, isSuccessful
+            ? MudBlazor.Severity.Success
+            : MudBlazor.Severity.Error);
     }
 
     private static string RenderListAsHtml(IReadOnlyList<string> items, string tag = "p")

diff --git a/Pkmds.Web/Components/PokemonSlotComponent.razor b/Pkmds.Web/Components/PokemonSlotComponent.razor
@@ -6,9 +6,7 @@
           Height="68px"
           Class="@SpriteHelper.GetSpriteCssClass(Pokemon)"
           Style="@GetStyle()">
-    @{ var title = Pokemon is { Species: > 0 }
-               ? AppService.GetPokemonSpeciesName(Pokemon.Species)
-               : "Unknown"; }
+    @{ var title = GetPokemonTitle(); }
     <object class="pkm-sprite"
             type="image/png"
             style="object-fit: contain;"

diff --git a/Pkmds.Web/Components/PokemonSlotComponent.razor.cs b/Pkmds.Web/Components/PokemonSlotComponent.razor.cs
@@ -25,4 +25,8 @@ protected override void OnInitialized() =>
 
     public void Dispose() =>
         RefreshService.OnAppStateChanged -= StateHasChanged;
+
+    private string GetPokemonTitle() => Pokemon is { Species: > 0 }
+        ? AppService.GetPokemonSpeciesName(Pokemon.Species)
+        : "Unknown";
 }
diff --git a/Pkmds.Web/Services/AppService.cs b/Pkmds.Web/Services/AppService.cs
@@ -1,6 +1,4 @@
-using PKHeX.Core;
-
-namespace Pkmds.Web.Services;
+namespace Pkmds.Web.Services;
 
 public class AppService(IAppState appState, IRefreshService refreshService) : IAppService
 {
@@ -159,6 +157,7 @@ public void SavePokemon(PKM? pokemon)
                 {
                     RefreshService.RefreshPartyState();
                 }
+
                 break;
             case SelectedPokemonType.Box:
                 AppState.SaveFile.SetBoxSlotAtIndex(pokemon, boxNumber, boxSlot);
@@ -349,7 +348,7 @@ public Task ImportMysteryGift(DataMysteryGift gift, out bool isSuccessful, out s
         var index = 0;
 
         var lastUnfilled = GetLastUnfilledByType(gift, album);
-        if (lastUnfilled > -1 && lastUnfilled < index)
+        if (lastUnfilled > -1)
         {
             index = lastUnfilled;
         }
@@ -407,13 +406,16 @@ static int GetLastUnfilledByType(DataMysteryGift gift, DataMysteryGift[] album)
 
                 return i;
             }
+
             return -1;
         }
 
         static DataMysteryGift[] LoadMysteryGifts(SaveFile saveFile, IMysteryGiftStorage cards)
         {
             var count = cards.GiftCountMax;
-            var size = saveFile is SAV4HGSS ? count + 1 : count;
+            var size = saveFile is SAV4HGSS
+                ? count + 1
+                : count;
             var result = new DataMysteryGift[size];
             for (var i = 0; i < count; i++)
             {
@@ -429,8 +431,8 @@ static DataMysteryGift[] LoadMysteryGifts(SaveFile saveFile, IMysteryGiftStorage
         }
 
         static IMysteryGiftStorage GetMysteryGiftProvider(SaveFile saveFile) => saveFile is IMysteryGiftStorageProvider provider
-                ? provider.MysteryGiftStorage
-                : throw new ArgumentException("Save file does not support Mystery Gifts.", nameof(saveFile));
+            ? provider.MysteryGiftStorage
+            : throw new ArgumentException("Save file does not support Mystery Gifts.", nameof(saveFile));
 
         static void SetCardId(int cardId, IMysteryGiftFlags? flags, List<string> receivedFlags)
         {
@@ -466,7 +468,7 @@ static void SaveReceivedFlags(IMysteryGiftFlags? flags, List<string> receivedFla
             flags.ClearReceivedFlags();
             foreach (var o in receivedFlags)
             {
-                if (o?.ToString() is not { } x || !int.TryParse(x, out var index))
+                if (!int.TryParse(o, out var index))
                 {
                     continue;
                 }
@@ -487,6 +489,7 @@ static void SaveReceivedCards(SaveFile saveFile, IMysteryGiftStorage cards, Data
                     hgss.LockCapsuleSlot = (PCD)album[^1];
                 }
             }
+
             var count = cards.GiftCountMax;
             for (var i = 0; i < count; i++)
             {
@@ -503,13 +506,13 @@ static void SaveReceivedCards(SaveFile saveFile, IMysteryGiftStorage cards, Data
     public Task ImportMysteryGift(byte[] data, string fileExtension, out bool isSuccessful, out string resultsMessage)
     {
         var gift = MysteryGift.GetMysteryGift(data, fileExtension);
-        if (gift is null)
+        if (gift is not null)
         {
-            isSuccessful = false;
-            resultsMessage = "The Mystery Gift could not be imported.";
-            return Task.CompletedTask;
+            return ImportMysteryGift(gift, out isSuccessful, out resultsMessage);
         }
 
-        return ImportMysteryGift(gift, out isSuccessful, out resultsMessage);
+        isSuccessful = false;
+        resultsMessage = "The Mystery Gift could not be imported.";
+        return Task.CompletedTask;
     }
 }
diff --git a/Pkmds.Web/SpriteHelper.cs b/Pkmds.Web/SpriteHelper.cs
@@ -31,7 +31,7 @@ private static string GetPokemonSpriteFilename(ushort species, EntityContext con
                         species: (ushort)Species.Frillish or (ushort)Species.Jellicent, gender: (byte)Gender.Female
                     } => $"{species}f",
                 { species: (ushort)Species.Alcremie } => $"{species}-{form}-{formArg1}",
-                (_, _, _, > 0, _, _) when FormInfo.HasTotemForm(species) && FormInfo.IsTotemForm(species, form) =>
+                { form: > 0 } when FormInfo.HasTotemForm(species) && FormInfo.IsTotemForm(species, form) =>
                     $"{species}-{FormInfo.GetTotemBaseForm(species, form)}",
                 { form: > 0 } => species switch
                 {