Fix up Showdown export, fixes #20

codemonkey85 · Mar 17, 2024 · 6e99d29 · 6e99d29
1 parent 91e69cf
commit 6e99d29
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor b/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor
@@ -1,6 +1,10 @@
-<MudDialog>
+@using System.Web
+@using System.Text.RegularExpressions
+
+<MudDialog>
     <DialogContent>
-        @ShowdownExport
+        @((MarkupString)Regex.Replace(
+            HttpUtility.HtmlEncode(ShowdownExport), "\r?\n|\r", "<br />"))
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="@Close"

diff --git a/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor.cs b/Pkmds.Web/Components/Dialogs/ShowdownExportDialog.razor.cs
@@ -8,7 +8,7 @@ public partial class ShowdownExportDialog
     [CascadingParameter]
     private MudDialogInstance? MudDialog { get; set; }
 
-    private string? ShowdownExport => Pokemon is not null ? AppService.ExportPokemonAsShowdown(Pokemon) : AppService.ExportPartyAsShowdown();
+    private string ShowdownExport => Pokemon is not null ? AppService.ExportPokemonAsShowdown(Pokemon) : AppService.ExportPartyAsShowdown();
 
     private void Close() => MudDialog?.Close();
 }
diff --git a/Pkmds.Web/Components/PartyGrid.razor b/Pkmds.Web/Components/PartyGrid.razor
@@ -20,7 +20,7 @@
         <MudButton OnClick="@ExportAsShowdown"
                    ButtonType="@ButtonType.Button"
                    Variant="@Variant.Filled"
-                   Class=""
+                   Class="my-3"
                    Color="@Color.Primary">
             Export as Showdown
         </MudButton>

diff --git a/Pkmds.Web/Components/PartyGrid.razor.cs b/Pkmds.Web/Components/PartyGrid.razor.cs
@@ -22,7 +22,7 @@ public void Dispose()
     }
 
     private void ExportAsShowdown() =>
-        DialogService.Show<Dialogs.ShowdownExportDialog>(
+        DialogService.Show<ShowdownExportDialog>(
             "Showdown Export",
             new DialogOptions
             {

diff --git a/Pkmds.Web/GlobalUsings.cs b/Pkmds.Web/GlobalUsings.cs
@@ -11,5 +11,6 @@
 global using PKHeX.Core;
 global using Pkmds.Web;
 global using Pkmds.Web.Components;
+global using Pkmds.Web.Components.Dialogs;
 global using Pkmds.Web.Extensions;
 global using Pkmds.Web.Services;
diff --git a/Pkmds.Web/Services/AppService.cs b/Pkmds.Web/Services/AppService.cs
@@ -187,8 +187,9 @@ public string ExportPartyAsShowdown()
             }
 
             sbShowdown.AppendLine(ShowdownParsing.GetShowdownText(pkm));
+            sbShowdown.AppendLine();
         }
 
-        return sbShowdown.ToString();
+        return sbShowdown.ToString().Trim();
     }
 }