Templates of generic controllers are now pre-compiled

- Improved readability of RemoveSuffix method
SparkViewEngine · Feb 20, 2024 · 4543161 · 4543161
1 parent 30f3496
commit 4543161
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/Spark.Web.Mvc/SparkViewFactory.cs b/src/Spark.Web.Mvc/SparkViewFactory.cs
@@ -276,7 +276,22 @@ public IList<SparkViewDescriptor> CreateDescriptors(SparkBatchEntry entry)
         {
             var descriptors = new List<SparkViewDescriptor>();
 
-            var controllerName = RemoveSuffix(entry.ControllerType.Name, "Controller");
+            string controllerName = null;
+
+            if (entry.ControllerType.ContainsGenericParameters)
+            {
+                // generic controller have a backtick suffix in their (name e.g. "SomeController`2")
+                var indexOfBacktick = entry.ControllerType.Name.IndexOf("Controller`", StringComparison.Ordinal);
+                if (indexOfBacktick > -1)
+                {
+                    // removing it otherwise locating the view templates will fail
+                    controllerName = entry.ControllerType.Name.Substring(0, indexOfBacktick);
+                }
+            }
+            else
+            {
+                controllerName = RemoveSuffix(entry.ControllerType.Name, "Controller");
+            }
 
             var viewNames = new List<string>();
 
@@ -375,12 +390,9 @@ private static bool TestMatch(string potentialMatch, string pattern)
 
         private static string RemoveSuffix(string value, string suffix)
         {
-            if (value.EndsWith(suffix, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return value.Substring(0, value.Length - suffix.Length);
-            }
-
-            return value;
+            return value.EndsWith(suffix, StringComparison.InvariantCultureIgnoreCase) 
+                ? value.Substring(0, value.Length - suffix.Length) 
+                : value;
         }
 
         #region IViewEngine Members