ref - Cleaned things up

We've cleaned things up. --- In preparation for the release, we've cleaned things up. --- Type: ref Breaking: False Doc Required: False Part: 1/1
Aptivi-Archives · Aug 12, 2023 · 1492cdb · 1492cdb
1 parent 0b10fdb
commit 1492cdb
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/Namer/NameGenerator.cs b/Namer/NameGenerator.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -55,21 +54,9 @@ public static async Task PopulateNamesAsync()
             try
             {
                 if (Names.Length == 0)
-                {
-                    HttpResponseMessage Response = await NameClient.GetAsync(nameAddress);
-                    Response.EnsureSuccessStatusCode();
-                    Stream NamesStream = await Response.Content.ReadAsStreamAsync();
-                    string NamesString = new StreamReader(NamesStream).ReadToEnd();
-                    Names = NamesString.SplitNewLines();
-                }
+                    Names = await PopulateInternalAsync(nameAddress);
                 if (Surnames.Length == 0)
-                {
-                    HttpResponseMessage Response = await NameClient.GetAsync(surnameAddress);
-                    Response.EnsureSuccessStatusCode();
-                    Stream SurnamesStream = await Response.Content.ReadAsStreamAsync();
-                    string SurnamesString = new StreamReader(SurnamesStream).ReadToEnd();
-                    Surnames = SurnamesString.SplitNewLines();
-                }
+                    Surnames = await PopulateInternalAsync(surnameAddress);
             }
             catch (Exception ex)
             {
@@ -338,6 +325,15 @@ internal static string[] GenerateNameArray(int Count, string NamePrefix, string
             return namesList.ToArray();
         }
 
+        internal static async Task<string[]> PopulateInternalAsync(string nameLink)
+        {
+            HttpResponseMessage Response = await NameClient.GetAsync(nameLink);
+            Response.EnsureSuccessStatusCode();
+            Stream SurnamesStream = await Response.Content.ReadAsStreamAsync();
+            string SurnamesString = new StreamReader(SurnamesStream).ReadToEnd();
+            return SurnamesString.SplitNewLines();
+        }
+
         /// <summary>
         /// Makes a string array with new line as delimiter
         /// </summary>