Remove custom UI template paths code

This no longer worked...time to simplify it. We're off jQuery.tmpl now.

Author: NickCraver

src/MiniProfiler.AspNetCore/EmbeddedProvider.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
-using StackExchange.Profiling.Internal;
 using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
@@ -55,33 +54,16 @@ public bool TryGetResource(string filename, out string resource)
                 return true;
             }
 
-            // Check the on-disk location first, if configured
-            if (_options.Value.UITemplatesPath.HasValue())
+            // Fall back to embedded
+            using (var stream = typeof(MiniProfiler).GetTypeInfo().Assembly.GetManifestResourceStream("StackExchange.Profiling.ui." + filename))
             {
-                var customFile = Path.Combine(_options.Value.UITemplatesPath, filename);
-                var fileInfo = _env.ContentRootFileProvider.GetFileInfo(customFile);
-                if (fileInfo.Exists)
+                if (stream == null)
                 {
-                    using (var stream = fileInfo.CreateReadStream())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        resource = reader.ReadToEnd();
-                    }
+                    return false;
                 }
-            }
-            else
-            {
-                // Fall back to embedded
-                using (var stream = typeof(MiniProfiler).GetTypeInfo().Assembly.GetManifestResourceStream("StackExchange.Profiling.ui." + filename))
+                using (var reader = new StreamReader(stream))
                 {
-                    if (stream == null)
-                    {
-                        return false;
-                    }
-                    using (var reader = new StreamReader(stream))
-                    {
-                        resource = reader.ReadToEnd();
-                    }
+                    resource = reader.ReadToEnd();
                 }
             }
 

src/MiniProfiler.AspNetCore/MiniProfilerOptions.cs

@@ -40,11 +40,5 @@ public class MiniProfilerOptions : MiniProfilerBaseOptions
         /// Function to provide the unique user ID based on the request, to store MiniProfiler IDs user
         /// </summary>
         public Func<HttpRequest, string> UserIdProvider { get; set; } = request => request.HttpContext.Connection.RemoteIpAddress.ToString();
-
-        /// <summary>
-        /// Gets or sets the content directory subfolder to load custom template overrides from.
-        /// For example, if you're using wwwroot and want to use wwwroot/profiler/, set this to "profiler/"
-        /// </summary>
-        public string UITemplatesPath { get; set; }
     }
 }

src/MiniProfiler/MiniProfilerHandler.cs

@@ -290,53 +290,21 @@ private string ResultsFullPage(HttpContext context, MiniProfiler profiler)
             return Render.SingleResultHtml(profiler, VirtualPathUtility.ToAbsolute(Options.RouteBasePath).EnsureTrailingSlash());
         }
 
-#if DEBUG
-        private static bool BypassLocalLoad = false;
-#endif
-
         private bool TryGetResource(string filename, out string resource)
         {
             filename = filename.ToLower();
 
-#if DEBUG
-            // attempt to simply load from file system, this lets up modify js without needing to recompile A MILLION TIMES 
-            if (!BypassLocalLoad)
-            {
-                var trace = new System.Diagnostics.StackTrace(true);
-                var path = Path.GetDirectoryName(trace.GetFrames()[0].GetFileName()) + "\\ui\\" + filename;
-                try
-                {
-                    resource = File.ReadAllText(path);
-                    return true;
-                }
-                catch
-                {
-                    BypassLocalLoad = true;
-                }
-            }
-#endif
-
             if (!ResourceCache.TryGetValue(filename, out resource))
             {
-                string customTemplatesPath = HttpContext.Current.Server.MapPath(Options.CustomUITemplates);
-                string customTemplateFile = Path.Combine(customTemplatesPath, filename);
-
-                if (File.Exists(customTemplateFile))
-                {
-                    resource = File.ReadAllText(customTemplateFile);
-                }
-                else
+                using (var stream = typeof(MiniProfiler).Assembly.GetManifestResourceStream("StackExchange.Profiling.ui." + filename))
                 {
-                    using (var stream = typeof(MiniProfiler).Assembly.GetManifestResourceStream("StackExchange.Profiling.ui." + filename))
+                    if (stream == null)
                     {
-                        if (stream == null)
-                        {
-                            return false;
-                        }
-                        using (var reader = new StreamReader(stream))
-                        {
-                            resource = reader.ReadToEnd();
-                        }
+                        return false;
+                    }
+                    using (var reader = new StreamReader(stream))
+                    {
+                        resource = reader.ReadToEnd();
                     }
                 }
 

src/MiniProfiler/MiniProfilerOptions.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Security.Cryptography;
 using System.Web;
 using StackExchange.Profiling.Helpers;
 using StackExchange.Profiling.Internal;
@@ -63,62 +59,6 @@ public MiniProfilerOptions()
         /// </summary>
         public bool EnableCompression { get; set; } = true;
 
-        /// <summary>
-        /// The path where custom UI elements are stored.
-        /// If the custom file doesn't exist, the standard resource is used.
-        /// This setting should be in APP RELATIVE FORM, e.g. "~/App_Data/MiniProfilerUI"
-        /// </summary>
-        /// <remarks>A web server restart is required to reload new files.</remarks>
-        public string CustomUITemplates { get; set; } = "~/App_Data/MiniProfilerUI";
-
-        private string _versionHash;
-        /// <summary>
-        /// The hash to use for file cache breaking, this is automatically calculated.
-        /// </summary>
-        public override string VersionHash => _versionHash ?? (_versionHash = GetVersionHash());
-
-        /// <summary>
-        /// On first call, set the version hash for all cache breakers.
-        /// </summary>
-        private string GetVersionHash()
-        {
-            try
-            {
-                if (HttpContext.Current == null) return base.VersionHash;
-                var files = new List<string>();
-
-                var customUITemplatesPath = HttpContext.Current.Server.MapPath(CustomUITemplates);
-                if (Directory.Exists(customUITemplatesPath))
-                {
-                    files.AddRange(Directory.EnumerateFiles(customUITemplatesPath));
-                }
-
-                if (files.Count == 0) return base.VersionHash;
-
-                using (var sha256 = new SHA256CryptoServiceProvider())
-                {
-                    var hash = new byte[sha256.HashSize / 8];
-                    foreach (string file in files)
-                    {
-                        // sha256 can throw a FIPS exception, but SHA256CryptoServiceProvider is FIPS BABY - FIPS 
-                        byte[] contents = File.ReadAllBytes(file);
-                        byte[] hashfile = sha256.ComputeHash(contents);
-                        for (int i = 0; i < (sha256.HashSize / 8); i++)
-                        {
-                            hash[i] = (byte)(hashfile[i] ^ hash[i]);
-                        }
-                    }
-                    return Convert.ToBase64String(hash);
-                }
-            }
-            catch (Exception e)
-            {
-                //VersionHash is pre-populated
-                Debug.WriteLine($"Error calculating folder hash: {e}\n{e.StackTrace}");
-                return base.VersionHash;
-            }
-        }
-
         /// <summary>
         /// Configures the <see cref="MiniProfilerHandler"/>.
         /// </summary>