From a08b0a121bb0547918b4fc7751bc9752a8a8b9c7 Mon Sep 17 00:00:00 2001
From: Jonathan Bout <jonathanbout01@gmail.com>
Date: Tue, 26 Nov 2024 12:39:19 +0100
Subject: [PATCH] Fix compression

---
 SimpleCDN/CDNLoader.cs           | 4 ++--
 SimpleCDN/Helpers/GZipHelpers.cs | 8 +++++---
 SimpleCDN/Program.cs             | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SimpleCDN/CDNLoader.cs b/SimpleCDN/CDNLoader.cs
index 2a70134..d7c5701 100644
--- 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
index 82838cd..a354d33 100644
--- 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
index 1688474..18306f6 100644
--- 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);