Fix compression

JonathanBout · Nov 26, 2024 · a08b0a1 · a08b0a1
1 parent de9ee0e
commit a08b0a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/SimpleCDN/CDNLoader.cs b/SimpleCDN/CDNLoader.cs
@@ -126,13 +126,13 @@ public class CDNLoader(IWebHostEnvironment environment, IOptionsMonitor<CDNConfi
 			};
 
 			// attempt to compress the file if it's not already compressed
-			/*if (!file.IsCompressed)
+			if (!file.IsCompressed)
 			{
 				var contentSpan = content.content.AsSpan();
 				bool compressed = GZipHelpers.TryCompress(ref contentSpan);
 				file.Content = contentSpan.ToArray();
 				file.IsCompressed = compressed;
-			}*/
+			}
 
 			_cache[absolutePath] = file;
 

diff --git a/SimpleCDN/Helpers/GZipHelpers.cs b/SimpleCDN/Helpers/GZipHelpers.cs
@@ -12,13 +12,15 @@ public class GZipHelpers
 		public static bool TryCompress(ref Span<byte> data)
 		{
 			using var memoryStream = new MemoryStream();
-			using var gzipStream = new GZipStream(memoryStream, CompressionMode.Compress);
-			gzipStream.Write(data);
-			gzipStream.Flush();
+			using (var gzipStream = new GZipStream(memoryStream, CompressionMode.Compress, true))
+			{
+				gzipStream.Write(data);
+			}
 
 			if (memoryStream.Length >= data.Length)
 				return false;
 
+			memoryStream.Position = 0;
 			var read = memoryStream.Read(data);
 
 			data = data[..read];

diff --git a/SimpleCDN/Program.cs b/SimpleCDN/Program.cs
@@ -1,5 +1,6 @@
 using SimpleCDN;
 using SimpleCDN.Configuration;
+using System.IO.Compression;
 
 var builder = WebApplication.CreateSlimBuilder(args);