ResourceDirectories

jiniannet · Dec 8, 2021 · f01223b · f01223b
1 parent d25982d
commit f01223b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/src/JinianNet.JNTemplate/Const.cs b/src/JinianNet.JNTemplate/Const.cs
@@ -15,7 +15,7 @@ public class Const
         /// <summary>
         /// Version
         /// </summary>
-        public const string Version = "2.2.4";
+        public const string Version = "2.2.5";
         internal const string KEY_FOREACH = "foreach";
         internal const string KEY_IF = "if";
         internal const string KEY_ELSEIF = "elseif";

diff --git a/src/JinianNet.JNTemplate/Hosting/DefaultHostEnvironment.cs b/src/JinianNet.JNTemplate/Hosting/DefaultHostEnvironment.cs
@@ -40,7 +40,6 @@ public DefaultHostEnvironment(IOptions options = null
             , IResourceLoader resourceLoader = null)
         {
             this.Results = new ResultCollection<IResult>();
-            this.ResourceDirectories = new List<string>();
             this.EnvironmentVariable = new Dictionary<string, string>(System.StringComparer.OrdinalIgnoreCase);
             this.Options = options ?? new RuntimeOptions();
             this.RootPath = System.IO.Directory.GetCurrentDirectory();
@@ -102,9 +101,6 @@ public DefaultHostEnvironment(IOptions options = null
         /// <inheritdoc />
         public IResourceLoader Loader { set; get; }
 
-        /// <inheritdoc />
-        public List<string> ResourceDirectories { get; }
-
         /// <inheritdoc />
         public Dictionary<string, string> EnvironmentVariable { set; get; }
 

diff --git a/src/JinianNet.JNTemplate/Hosting/IHostEnvironment.cs b/src/JinianNet.JNTemplate/Hosting/IHostEnvironment.cs
@@ -75,11 +75,6 @@ public interface IHostEnvironment
         /// </summary>
         IResourceLoader Loader { set; get; }
 
-        /// <summary>
-        /// Gets or sets the global resource directories of the engine.
-        /// </summary>
-        /// <value></value>
-        List<string> ResourceDirectories { get; }
         /// <summary>
         /// Gets or sets the environment variable of the engine.
         /// </summary>

diff --git a/src/JinianNet.JNTemplate/JinianNet.JNTemplate.csproj b/src/JinianNet.JNTemplate/JinianNet.JNTemplate.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>JinianNet.JNTemplate</RootNamespace>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Authors>JinianNet.com</Authors>
     <Company>JinianNet.com</Company>
     <Product>JNTemplate</Product>
@@ -25,8 +25,8 @@
     <PostBuildEvent></PostBuildEvent>
     <AssemblyOriginatorKeyFile>jiniannet.snk</AssemblyOriginatorKeyFile>
     <PackageLicenseFile>License.txt</PackageLicenseFile>
-    <FileVersion>2.2.4.0</FileVersion>
-    <AssemblyVersion>2.2.4.0</AssemblyVersion>
+    <FileVersion>2.2.5.0</FileVersion>
+    <AssemblyVersion>2.2.5.0</AssemblyVersion>
     <DelaySign>false</DelaySign> 
   </PropertyGroup>
 

diff --git a/src/JinianNet.JNTemplate/Runtime/IOptions.cs b/src/JinianNet.JNTemplate/Runtime/IOptions.cs
@@ -79,5 +79,10 @@ public interface IOptions
         /// Gets or sets the global data of the engine.
         /// </summary>
         IVariableScope Data { set; get; }
+        /// <summary>
+        /// Gets or sets the global resource directories of the engine.
+        /// </summary>
+        /// <value></value>
+        List<string> ResourceDirectories { get; }
     }
 }
diff --git a/src/JinianNet.JNTemplate/Runtime/RuntimeOptions.cs b/src/JinianNet.JNTemplate/Runtime/RuntimeOptions.cs
@@ -34,6 +34,7 @@ internal RuntimeOptions()
             this.Mode = EngineMode.Compiled;
             this.DisableeLogogram = false;
             this.EnableCache = true;
+            this.ResourceDirectories = new List<string>();
         }
         /// <inheritdoc />
         public bool DisableeLogogram { get; set; }
@@ -75,5 +76,8 @@ public bool EnableCompile
 
         /// <inheritdoc />
         public EngineMode Mode { get; set; }
+
+        /// <inheritdoc />
+        public List<string> ResourceDirectories { get; }
     }
 }
diff --git a/src/JinianNet.JNTemplate/TemplateContextExtensions.cs b/src/JinianNet.JNTemplate/TemplateContextExtensions.cs
@@ -34,7 +34,7 @@ public static string[] GetResourceDirectories(this Context ctx)
             //paths[0] = ctx.CurrentPath;
             //ctx.Options.ResourceDirectories.CopyTo(paths, 1);
             //return paths;
-            return ctx.Environment.ResourceDirectories.ToArray();
+            return ctx.Environment.Options.ResourceDirectories.ToArray();
         }
 
         /// <summary>

diff --git a/src/JinianNet.JNTemplate/TemplatingEngine.cs b/src/JinianNet.JNTemplate/TemplatingEngine.cs
@@ -97,10 +97,7 @@ public IEngine Configure(IConfig option)
             {
                 foreach (var path in option.ResourceDirectories)
                 {
-                    if (!HostEnvironment.ResourceDirectories.Contains(path))
-                    {
-                        HostEnvironment.ResourceDirectories.Add(path);
-                    }
+                    AppendResourcePath(path);
                 }
             }
             if (option.GlobalData != null && option.GlobalData.Count > 0)
@@ -310,9 +307,10 @@ public ITemplate LoadTemplate(string name, string path)
         /// <inheritdoc />
         public IEngine AppendResourcePath(string path)
         {
-            if (!HostEnvironment.ResourceDirectories.Contains(path))
+            var options = HostEnvironment.Options;
+            if (!options.ResourceDirectories.Contains(path))
             {
-                HostEnvironment.ResourceDirectories.Add(path);
+                options.ResourceDirectories.Add(path);
             }
             return this;
         }