Also allow relative path

introduce ifdef for the different plattforms to test the path on all 3 operating systems

Author: stefannikolei

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -72,7 +72,7 @@ public PhysicalFileSystemCache(
 
             // Allow configuration of the cache without having to register everything.
             this.cacheOptions = cacheOptions != null ? cacheOptions.Value : new PhysicalFileSystemCacheOptions();
-            this.cacheRootPath = GetCacheRoot(this.cacheOptions, environment.WebRootPath);
+            this.cacheRootPath = GetCacheRoot(this.cacheOptions, environment.WebRootPath, environment.ContentRootPath);
             if (!Directory.Exists(this.cacheRootPath))
             {
                 Directory.CreateDirectory(this.cacheRootPath);
@@ -89,13 +89,17 @@ public PhysicalFileSystemCache(
         /// </summary>
         /// <param name="cacheOptions">the cache options.</param>
         /// <param name="webRootPath">the webRootPath.</param>
+        /// <param name="contentRootPath">the contentRootPath.</param>
         /// <returns>root path.</returns>
-        internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions, string webRootPath)
+        internal static string GetCacheRoot(in PhysicalFileSystemCacheOptions cacheOptions, in string webRootPath, in string contentRootPath)
         {
             var cacheRoot = string.IsNullOrEmpty(cacheOptions.CacheRoot)
                 ? webRootPath
                 : cacheOptions.CacheRoot;
-            return Path.Combine(cacheRoot, cacheOptions.CacheFolder);
+
+            return Path.IsPathFullyQualified(cacheRoot)
+                ? Path.Combine(cacheRoot, cacheOptions.CacheFolder)
+                : Path.GetFullPath(Path.Combine(cacheRoot, cacheOptions.CacheFolder), contentRootPath);
         }
 
         /// <inheritdoc/>

tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs

@@ -21,27 +21,29 @@ public void FilePathMatchesReference()
             Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void CacheRootFromOptions()
-        {
-            var cacheOptions = new PhysicalFileSystemCacheOptions();
-            cacheOptions.CacheFolder = "cacheFolder";
-            cacheOptions.CacheRoot = "C:\\Temp";
-
-            var cacheRoot = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, null);
-
-            Assert.Equal(Path.Combine(cacheOptions.CacheRoot, cacheOptions.CacheFolder), cacheRoot);
-        }
-
-        [Fact]
-        public void CacheRootFromEnvironment()
+        [Theory]
+#if Linux
+        [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder")]
+        [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder")]
+        [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder")]
+#elif OSX
+        [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder")]
+        [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder")]
+        [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder")]
+#elif Windows
+        [InlineData("cacheFolder", "C:/Temp", null, null, "C:/Temp/cacheFolder")]
+        [InlineData("cacheFolder", null, "C:/WebRoot", null, "C:/WebRoot/cacheFolder")]
+        [InlineData("cacheFolder", "../Temp", null, "C:/this/a/root", "C:/this/a/Temp/cacheFolder")]
+#endif
+        public void CacheRootFromOptions(string cacheFolder, string cacheRoot, string webRootPath, string contentRootPath, string expected)
         {
             var cacheOptions = new PhysicalFileSystemCacheOptions();
-            cacheOptions.CacheFolder = "cacheFolder";
+            cacheOptions.CacheFolder = cacheFolder;
+            cacheOptions.CacheRoot = cacheRoot;
 
-            var cacheRoot = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, "C:\\WebRoot");
+            var cacheRootResult = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
 
-            Assert.Equal(Path.Combine("C:\\WebRoot", cacheOptions.CacheFolder), cacheRoot);
+            Assert.Equal(expected, cacheRootResult);
         }
     }
 }

tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj

@@ -8,6 +8,19 @@
 
     <!--Used to show test project to dotnet test-->
     <IsTestProject>true</IsTestProject>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Linux</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>