fix self contained resource file

yatima1460 · May 15, 2024 · 29283cf · 29283cf
1 parent 602e7cb
commit 29283cf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -6,8 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+
+
   <ItemGroup>
-    <None Remove="words_alpha.txt" />
+	<EmbeddedResource Include="words_alpha.txt" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Core/Heuristics.cs b/Core/Heuristics.cs
@@ -15,21 +15,24 @@ internal static class Heuristics
 
         static Heuristics()
         {
-            string? path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            if (path == null)
+            var assembly = Assembly.GetExecutingAssembly();
+            var resourceName = assembly.GetManifestResourceNames().FirstOrDefault(name => name.EndsWith("words_alpha.txt"));
+
+            if (resourceName == null)
             {
-                Console.WriteLine("Executing assembly path is null???");
+                Console.WriteLine("Can't find words dictionary in embedded resources");
                 dict = [];
                 return;
             }
-            var DictPath = Path.Combine(path, "words_alpha.txt");
-            if (!File.Exists(DictPath))
+
+            using var stream = assembly.GetManifestResourceStream(resourceName);
+            if (stream != null)
             {
-                Console.WriteLine("Can't find words dictionary");
-                dict = [];
-                return;
+                using var reader = new StreamReader(stream);
+                dict = reader.ReadToEnd().Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).ToImmutableHashSet<string>();
             }
-            dict = [.. File.ReadAllLines(DictPath)];
+
+            dict = [];
         }