Clean up duplicate pragma directives

bdawg1989 · Jun 11, 2024 · 232e2ab · 232e2ab
1 parent 88acc0a
commit 232e2ab
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 320 deletions.
diff --git a/SysBot.Pokemon.Discord/Commands/Bots/BotAvatar.cs b/SysBot.Pokemon.Discord/Commands/Bots/BotAvatar.cs
@@ -38,7 +38,7 @@ public async Task SetAvatarAsync()
             using var httpClient = new HttpClient();
             var imageBytes = await httpClient.GetByteArrayAsync(attachment.Url);
 
-            using var ms = new MemoryStream(imageBytes);
+            await using var ms = new MemoryStream(imageBytes);
             var image = new Image(ms);
             await Context.Client.CurrentUser.ModifyAsync(user => user.Avatar = image);
 

diff --git a/SysBot.Pokemon.Discord/Commands/Bots/Pokepaste.cs b/SysBot.Pokemon.Discord/Commands/Bots/Pokepaste.cs
@@ -21,16 +21,12 @@ public class Pokepaste : ModuleBase<SocketCommandContext>
     {
         private static System.Drawing.Image CombineImages(List<System.Drawing.Image> images)
         {
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
             int width = images.Sum(img => img.Width);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
             int height = images.Max(img => img.Height);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
 
 #pragma warning disable CA1416 // Validate platform compatibility
             Bitmap combinedImage = new Bitmap(width, height);
@@ -87,7 +83,7 @@ await Task.Run(async () =>
                     var pokemonImages = new List<System.Drawing.Image>();
 #pragma warning restore CA1416 // Validate platform compatibility
 
-                    using var memoryStream = new MemoryStream();
+                    await using var memoryStream = new MemoryStream();
                     using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
                     {
                         foreach (var set in showdownSets)
@@ -121,17 +117,13 @@ await Task.Run(async () =>
                                 var speciesName = GameInfo.GetStrings("en").Species[set.Species];
                                 var fileName = namer.GetName(pk); // Use GengarNamer to generate the file name
                                 var entry = archive.CreateEntry($"{fileName}.{pk.Extension}");
-                                using var entryStream = entry.Open();
+                                await using var entryStream = entry.Open();
                                 await entryStream.WriteAsync(pk.Data.AsMemory(0, pk.Data.Length)).ConfigureAwait(false);
 
                                 string speciesImageUrl = AbstractTrade<PK9>.PokeImg(pk, false, false);
-#pragma warning disable CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                                 var speciesImage = await Task.Run(() => System.Drawing.Image.FromStream(new HttpClient().GetStreamAsync(speciesImageUrl).Result)).ConfigureAwait(false);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                                 pokemonImages.Add(speciesImage);
 #pragma warning restore CA1416 // Validate platform compatibility
@@ -155,12 +147,10 @@ await Task.Run(async () =>
 #pragma warning disable CA1416 // Validate platform compatibility
                     combinedImage.Save($"{title}.png");
 #pragma warning restore CA1416 // Validate platform compatibility
-                    using (var imageStream = new MemoryStream())
+                    await using (var imageStream = new MemoryStream())
                     {
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                         combinedImage.Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
-#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CA1416 // Validate platform compatibility
                         imageStream.Position = 0;
 

diff --git a/SysBot.Pokemon.Discord/Commands/Bots/RemoteControlModule.cs b/SysBot.Pokemon.Discord/Commands/Bots/RemoteControlModule.cs
@@ -111,7 +111,7 @@ private async Task ClickAsyncImpl(SwitchButton button, BotSource<PokeBotState> b
         await ReplyAsync($"{b.Connection.Name} has performed: {button}").ConfigureAwait(false);
     }
 
-    private string GetRunningBotIP()
+    private static string GetRunningBotIP()
     {
         var r = SysCord<T>.Runner;
         var runningBot = r.Bots.Find(x => x.IsRunning);
@@ -130,7 +130,7 @@ private string GetRunningBotIP()
 
     private async Task SetScreen(bool on)
     {
-        string ip = GetRunningBotIP();
+        string ip = RemoteControlModule<T>.GetRunningBotIP();
         var bot = GetBot(ip);
         if (bot == null)
         {

diff --git a/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs b/SysBot.Pokemon.Discord/Commands/Bots/TradeModule.cs
@@ -773,7 +773,7 @@ public async Task BatchTradeZipAsync()
         }
 
         var zipBytes = await new HttpClient().GetByteArrayAsync(attachment.Url);
-        using var zipStream = new MemoryStream(zipBytes);
+        await using var zipStream = new MemoryStream(zipBytes);
         using var archive = new ZipArchive(zipStream, ZipArchiveMode.Read);
         var entries = archive.Entries.ToList();
 
@@ -791,7 +791,7 @@ public async Task BatchTradeZipAsync()
 
         foreach (var entry in entries)
         {
-            using var entryStream = entry.Open();
+            await using var entryStream = entry.Open();
             var pkBytes = await TradeModule<T>.ReadAllBytesAsync(entryStream).ConfigureAwait(false);
             var pk = EntityFormat.GetFromBytes(pkBytes);
 
@@ -809,7 +809,7 @@ public async Task BatchTradeZipAsync()
 
     private static async Task<byte[]> ReadAllBytesAsync(Stream stream)
     {
-        using var memoryStream = new MemoryStream();
+        await using var memoryStream = new MemoryStream();
         await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
         return memoryStream.ToArray();
     }

diff --git a/SysBot.Pokemon.Discord/Commands/Bots/VGCPastes.cs b/SysBot.Pokemon.Discord/Commands/Bots/VGCPastes.cs
@@ -19,7 +19,7 @@ namespace SysBot.Pokemon.Discord
     {
         // Uses VGCPastes Repository Spreadsheet in which they keep track of all current teams
         // https://twitter.com/VGCPastes
-        private async Task<string> DownloadSpreadsheetAsCsv()
+        private static async Task<string> DownloadSpreadsheetAsCsv()
         {
             var GID = SysCord<T>.Runner.Config.Trade.VGCPastesConfiguration.GID;
             var csvUrl = $"https://docs.google.com/spreadsheets/d/1axlwmzPA49rYkqXh7zHvAtSP-TKbM0ijGYBPRflLSWw/export?format=csv&gid={GID}";
@@ -32,7 +32,7 @@ private async Task<string> DownloadSpreadsheetAsCsv()
 
         private async Task<List<List<string>>> FetchSpreadsheetData()
         {
-            var csvData = await DownloadSpreadsheetAsCsv();
+            var csvData = await VGCPastes<T>.DownloadSpreadsheetAsCsv();
             var rows = csvData.Split('\n');
             var data = rows.Select(row => row.Split(',').Select(cell => cell.Trim('"')).ToList()).ToList();
             return data;
@@ -77,7 +77,7 @@ private async Task<List<List<string>>> FetchSpreadsheetData()
             return pokePasteData;
         }
 
-        private (string PokePasteUrl, List<string> RowData) SelectRandomPokePasteUrl(List<List<string>> data, string? pokemonName = null)
+        private static (string PokePasteUrl, List<string> RowData) SelectRandomPokePasteUrl(List<List<string>> data, string? pokemonName = null)
         {
             var filteredData = data.Where(row => row.Count > 40 && Uri.IsWellFormedUriString(row[24]?.Trim('"'), UriKind.Absolute));
 
@@ -122,7 +122,7 @@ public async Task GenerateSpreadsheetTeamAsync(string? pokemonName = null)
                 var spreadsheetData = await FetchSpreadsheetData();
 
                 // Use the adjusted method to select a random PokePaste URL (and row data) based on the Pokémon name
-                var (PokePasteUrl, selectedRow) = SelectRandomPokePasteUrl(spreadsheetData, pokemonName);
+                var (PokePasteUrl, selectedRow) = VGCPastes<T>.SelectRandomPokePasteUrl(spreadsheetData, pokemonName);
                 if (PokePasteUrl == null)
                 {
                     await ReplyAsync("Failed to find a valid PokePaste URL with the specified Pokémon.");
@@ -155,7 +155,7 @@ public async Task GenerateSpreadsheetTeamAsync(string? pokemonName = null)
 #pragma warning disable CS8604 // Possible null reference argument.
                 var sanitizedTeamDescription = SanitizeFileName(teamDescription);
 #pragma warning restore CS8604 // Possible null reference argument.
-                using var memoryStream = new MemoryStream();
+                await using var memoryStream = new MemoryStream();
                 using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
                 {
                     foreach (var set in showdownSets)
@@ -179,7 +179,7 @@ public async Task GenerateSpreadsheetTeamAsync(string? pokemonName = null)
                             var speciesName = GameInfo.GetStrings("en").Species[set.Species];
                             var fileName = namer.GetName(pk);
                             var entry = archive.CreateEntry($"{fileName}.{pk.Extension}");
-                            using var entryStream = entry.Open();
+                            await using var entryStream = entry.Open();
                             await entryStream.WriteAsync(pk.Data.AsMemory(0, pk.Data.Length));
 
                             string speciesImageUrl = AbstractTrade<PK9>.PokeImg(pk, false, false);
@@ -210,12 +210,10 @@ public async Task GenerateSpreadsheetTeamAsync(string? pokemonName = null)
 #pragma warning disable CA1416 // Validate platform compatibility
                 combinedImage.Save("spreadsheetteam.png");
 #pragma warning restore CA1416 // Validate platform compatibility
-                using (var imageStream = new MemoryStream())
+                await using (var imageStream = new MemoryStream())
                 {
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                     combinedImage.Save(imageStream, System.Drawing.Imaging.ImageFormat.Png);
-#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning restore CA1416 // Validate platform compatibility
                     imageStream.Position = 0;
 
@@ -287,16 +285,12 @@ private static List<ShowdownSet> ParseShowdownSets(string pokePasteHtml)
 
         private static System.Drawing.Image CombineImages(List<System.Drawing.Image> images)
         {
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
             int width = images.Sum(img => img.Width);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
             int height = images.Max(img => img.Height);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
 
 #pragma warning disable CA1416 // Validate platform compatibility
             Bitmap combinedImage = new Bitmap(width, height);

diff --git a/SysBot.Pokemon.Discord/Commands/Management/BotModule.cs b/SysBot.Pokemon.Discord/Commands/Management/BotModule.cs
@@ -39,14 +39,8 @@ private static string GetBotIPFromJsonConfig()
                 var config = JObject.Parse(jsonData);
 
                 // Access the IP address from the first bot in the Bots array
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
 #pragma warning disable CS8602 // Dereference of a possibly null reference.
                 var ip = config["Bots"][0]["Connection"]["IP"].ToString();
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
 #pragma warning restore CS8602 // Dereference of a possibly null reference.
                 return ip;
             }

diff --git a/SysBot.Pokemon.Discord/Commands/Management/OwnerModule.cs b/SysBot.Pokemon.Discord/Commands/Management/OwnerModule.cs
@@ -263,7 +263,7 @@ public async Task RePeek()
             return;
         }
 
-        using MemoryStream ms = new(bytes);
+        await using MemoryStream ms = new(bytes);
         var img = "cap.jpg";
         var embed = new EmbedBuilder { ImageUrl = $"attachment://{img}", Color = (DiscordColor?)Color.Purple }
             .WithFooter(new EmbedFooterBuilder { Text = "Here's your screenshot." });
@@ -320,20 +320,14 @@ public async Task RePeekGIF()
                         return;
                     }
 
-                    using (var ms = new MemoryStream(bytes))
+                    await using (var ms = new MemoryStream(bytes))
                     {
 #pragma warning disable CA1416 // Validate platform compatibility
                         using var bitmap = new Bitmap(ms);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
-#pragma warning disable CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                         var frame = bitmap.Clone(new Rectangle(0, 0, bitmap.Width, bitmap.Height), System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 #pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
-#pragma warning restore CA1416 // Validate platform compatibility
 #pragma warning disable CA1416 // Validate platform compatibility
                         gifFrames.Add(frame);
 #pragma warning restore CA1416 // Validate platform compatibility
@@ -342,7 +336,7 @@ public async Task RePeekGIF()
                     await Task.Delay(screenshotInterval).ConfigureAwait(false);
                 }
 
-                using (var ms = new MemoryStream())
+                await using (var ms = new MemoryStream())
                 {
                     using (var gif = new AnimatedGifCreator(ms, 200))
                     {
@@ -387,14 +381,8 @@ private static string GetBotIPFromJsonConfig()
             var jsonData = File.ReadAllText(TradeBot.ConfigPath);
             var config = JObject.Parse(jsonData);
 
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
 #pragma warning disable CS8602 // Dereference of a possibly null reference.
             var ip = config["Bots"][0]["Connection"]["IP"].ToString();
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
 #pragma warning restore CS8602 // Dereference of a possibly null reference.
             return ip;
         }

diff --git a/SysBot.Pokemon.Discord/Commands/Management/TradeStartModule.cs b/SysBot.Pokemon.Discord/Commands/Management/TradeStartModule.cs
@@ -244,7 +244,7 @@ private static async Task<Bitmap> LoadImageAsync(string imagePath)
         {
             using var httpClient = new HttpClient();
             using var response = await httpClient.GetAsync(imagePath);
-            using var stream = await response.Content.ReadAsStreamAsync();
+            await using var stream = await response.Content.ReadAsStreamAsync();
 #pragma warning disable CA1416 // Validate platform compatibility
             return new Bitmap(stream);
 #pragma warning restore CA1416 // Validate platform compatibility