[Feature] Consolidate duplicated ResourceLoader into shared Reporting implementation; fixes #44

ECoreNetto.Reporting/Generators/HandleBarsReportGenerator.cs

@@ -56,8 +56,8 @@
             this.Handlebars = HandlebarsDotNet.Handlebars.CreateSharedEnvironment();
             HandlebarsHelpers.Register(Handlebars);
 
             this.RegisterHelpers();
             this.RegisterTemplates();
         }
 
         /// <summary>
@@ -91,7 +91,7 @@
         {
             var templatePath = $"ECoreNetto.Reporting.Templates.{name}.hbs";
 
-            var template = ResourceLoader.LoadEmbeddedResource(templatePath);
+            var template = ResourceLoader.LoadEmbeddedResource(typeof(HandleBarsReportGenerator).Assembly, templatePath);
 
             var compiledTemplate = Handlebars.Compile(template);
 
@@ -115,7 +115,7 @@
             var dataTypes = new List<EDataType>();
             var eClasses = new List<EClass>();
 
             foreach (var package in packages)
             {
                 enums.AddRange(package.EClassifiers.OfType<EEnum>());
 

ECoreNetto.Reporting/Resources/ResourceLoader.cs

@@ -27,21 +27,22 @@ namespace ECoreNetto.Reporting.Resources
     /// <summary>
     /// Class responsible for loading embedded resources.
     /// </summary>
-    internal static class ResourceLoader
+    public static class ResourceLoader
     {
         /// <summary>
-        /// Load an embedded resource
+        /// Load an embedded resource from the provided <see cref="Assembly"/>
         /// </summary>
+        /// <param name="assembly">
+        /// The <see cref="Assembly"/> whose manifest contains the embedded resource
+        /// </param>
         /// <param name="path">
         /// The path of the embedded resource
         /// </param>
         /// <returns>
         /// a string containing the contents of the embedded resource
         /// </returns>
-        public static string LoadEmbeddedResource(string path)
+        public static string LoadEmbeddedResource(Assembly assembly, string path)
         {
-            var assembly = Assembly.GetExecutingAssembly();
-
             using var stream = assembly.GetManifestResourceStream(path);
 
             using var reader = new StreamReader(stream ?? throw new MissingManifestResourceException());

ECoreNetto.Tools/Resources/ResourceLoader.cs

@@ -20,17 +20,18 @@
 
 namespace ECoreNetto.Tools.Resources
 {
-    using System.IO;
     using System.Reflection;
-    using System.Resources;
+
+    using SharedResourceLoader = ECoreNetto.Reporting.Resources.ResourceLoader;
 
     /// <summary>
-    /// Class responsible for loading embedded resources.
+    /// Class responsible for loading embedded resources from this assembly and for the
+    /// Tools-specific version and logo queries.
     /// </summary>
     public static class ResourceLoader
     {
         /// <summary>
-        /// Load an embedded resource
+        /// Load an embedded resource from the executing (ECoreNetto.Tools) assembly
         /// </summary>
         /// <param name="path">
         /// The path of the embedded resource
@@ -40,13 +41,7 @@ public static class ResourceLoader
         /// </returns>
         public static string LoadEmbeddedResource(string path)
         {
-            var assembly = Assembly.GetExecutingAssembly();
-
-            using var stream = assembly.GetManifestResourceStream(path);
-
-            using var reader = new StreamReader(stream ?? throw new MissingManifestResourceException());
-
-            return reader.ReadToEnd();
+            return SharedResourceLoader.LoadEmbeddedResource(Assembly.GetExecutingAssembly(), path);
         }
 
         /// <summary>