Changed API to accept Stream

Author: redradist

src/Host.cs

@@ -592,6 +592,24 @@ public Module LoadModule(string path)
             return LoadModule(Path.GetFileNameWithoutExtension(path), File.ReadAllBytes(path));
         }
 
+        /// <summary>
+        /// Loads a <see cref="Module"/> given stream as WebAssembly.
+        /// </summary>
+        /// <param name="moduleName">Name of the module</param>
+        /// <param name="stream">Stream with module data</param>
+        /// <returns>Returns a new <see cref="Module"/>.</returns>
+        public Module LoadModule(string moduleName, Stream moduleStream)
+        {
+            using (StreamReader reader = new StreamReader(moduleStream))
+            {
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    reader.BaseStream.CopyTo(ms);
+                    return LoadModule(moduleName, ms.ToArray());
+                }
+            }
+        }
+        
         /// <summary>
         /// Loads a <see cref="Module"/> based on a WebAssembly text format representation.
         /// </summary>
@@ -645,53 +663,17 @@ public Module LoadModuleText(string path)
             return LoadModuleText(Path.GetFileNameWithoutExtension(path), File.ReadAllText(path));
         }
 
-        public Module LoadEmbeddedModule(string resourceName)
-        {
-            var assembly = Assembly.GetCallingAssembly();
-            var allResources = new List<string>(
-                 assembly.GetManifestResourceNames().Where(str => str.EndsWith(resourceName))
-             );
-            if (allResources.Count == 0)
-            {
-                throw new ArgumentException($"Could not find resource: {resourceName} !!");
-            }
-            if (allResources.Count > 1)
-            {
-                throw new ArgumentException(@$"Found more than one resource with name {resourceName}: {allResources} !! Consider specify full path to resource ...");
-            }
-            var assemblyResourceName = allResources.First();
-            using (Stream stream = assembly.GetManifestResourceStream(assemblyResourceName))
-            using (StreamReader reader = new StreamReader(stream))
-            {
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    reader.BaseStream.CopyTo(ms);
-                    byte[] bytes = ms.ToArray();
-                    return LoadModule(Path.GetFileNameWithoutExtension(assemblyResourceName), bytes);
-                }
-            }
-        }
-        
-        public Module LoadEmbeddedModuleText(string resourceName)
+        /// <summary>
+        /// Loads a <see cref="Module"/> given stream as WebAssembly text format stream.
+        /// </summary>
+        /// <param name="moduleName">Name of the module</param>
+        /// <param name="stream">WebAssembly text format stream with module data</param>
+        /// <returns>Returns a new <see cref="Module"/>.</returns>
+        public Module LoadModuleText(string moduleName, Stream moduleStream)
         {
-            var assembly = Assembly.GetCallingAssembly();
-            var allResources = new List<string>(
-                assembly.GetManifestResourceNames().Where(str => str.EndsWith(resourceName))
-            );
-            if (allResources.Count == 0)
-            {
-                throw new ArgumentException($"Could not find resource: {resourceName} !!");
-            }
-            if (allResources.Count > 1)
-            {
-                throw new ArgumentException(@$"Found more than one resource with name {resourceName}: {allResources} !! Consider specify full path to resource ...");
-            }
-            var assemblyResourceName = allResources.First();
-            using (Stream stream = assembly.GetManifestResourceStream(assemblyResourceName))
-            using (StreamReader reader = new StreamReader(stream))
+            using (StreamReader reader = new StreamReader(moduleStream))
             {
-                string text = reader.ReadToEnd();
-                return LoadModuleText(Path.GetFileNameWithoutExtension(assemblyResourceName), text);
+                return LoadModuleText(moduleName, reader.ReadToEnd());
             }
         }
 

tests/Fixtures/ModuleFixture.cs

@@ -15,7 +15,10 @@ public ModuleFixture()
 
             var modulePath = Path.Combine("Modules", ModuleFileName);
             Module = Host.LoadModuleText(modulePath);
-            EmbeddedModule = Host.LoadEmbeddedModuleText(modulePath);
+            using (FileStream fs = File.OpenRead(modulePath))
+            {
+                StreamModule = Host.LoadModuleText(modulePath, fs);
+            }
         }
 
         public void Dispose()
@@ -26,10 +29,10 @@ public void Dispose()
                 Module = null;
             }
 
-            if (!(EmbeddedModule is null))
+            if (!(StreamModule is null))
             {
-                EmbeddedModule.Dispose();
-                EmbeddedModule = null;
+                StreamModule.Dispose();
+                StreamModule = null;
             }
 
             if (!(Host is null))
@@ -41,7 +44,7 @@ public void Dispose()
 
         public Host Host { get; set; }
         public Module Module { get; set; }
-        public Module EmbeddedModule { get; set; }
+        public Module StreamModule { get; set; }
 
         protected abstract string ModuleFileName { get; }
     }

tests/Wasmtime.Tests.csproj

@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <None Update="Modules/*.wat" CopyToOutputDirectory="PreserveNewest" />
-    <EmbeddedResource Update="Modules/*.wat" />
+<!--    <EmbeddedResource Update="Modules/*.wat" />-->
   </ItemGroup>
 
 </Project>