From ff55be0f5bb4ff1ad73cbf8853ad4a4687dbf90e Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Fri, 4 May 2018 11:33:16 -0400
Subject: [PATCH] Improve dme modifications

---
 .../Components/DreamMaker.cs                  | 11 ++++--
 .../Components/IConfiguration.cs              |  4 +-
 .../Components/ServerSideModifications.cs     | 38 +++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/Tgstation.Server.Host/Components/ServerSideModifications.cs

diff --git a/src/Tgstation.Server.Host/Components/DreamMaker.cs b/src/Tgstation.Server.Host/Components/DreamMaker.cs
index 4abd5e10b5..0300c94352 100644
--- a/src/Tgstation.Server.Host/Components/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/DreamMaker.cs
@@ -181,16 +181,21 @@ namespace Tgstation.Server.Host.Components
 
 			var dmeModifications = await dmeModificationsTask.ConfigureAwait(false);
 
-			if (!dmeModifications.Any())
+			if (dmeModifications == null || dmeModifications.TotalDmeOverwrite)
 				return;
 
 			var dmeLines = new List<string>(dme.Split(new[] { Environment.NewLine }, StringSplitOptions.None));
 			for (var I = 0; I < dmeLines.Count; ++I)
 			{
 				var line = dmeLines[I];
-				if (line.Contains("BEGIN_INCLUDE"))
+				if (line.Contains("BEGIN_INCLUDE") && dmeModifications.HeadIncludeLine != null)
 				{
-					dmeLines.InsertRange(I + 1, dmeModifications);
+					dmeLines.Insert(I + 1, dmeModifications.HeadIncludeLine);
+					++I;
+				}
+				else if (line.Contains("END_INCLUDE") && dmeModifications.TailIncludeLine != null)
+				{
+					dmeLines.Insert(I - 1, dmeModifications.TailIncludeLine);
 					break;
 				}
 			}
diff --git a/src/Tgstation.Server.Host/Components/IConfiguration.cs b/src/Tgstation.Server.Host/Components/IConfiguration.cs
index 3a6f2f0ded..3b31dda93e 100644
--- a/src/Tgstation.Server.Host/Components/IConfiguration.cs
+++ b/src/Tgstation.Server.Host/Components/IConfiguration.cs
@@ -16,8 +16,8 @@ namespace Tgstation.Server.Host.Components
 		/// </summary>
 		/// <param name="destination">Path to the destination folder</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
-		/// <returns>A <see cref="Task{TResult}"/> resultin in a <see cref="IReadOnlyList{T}"/> of #include lines for the .dm files copied</returns>
-		Task<IReadOnlyList<string>> CopyDMFilesTo(string destination, CancellationToken cancellationToken);
+		/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="ServerSideModifications"/> if any</returns>
+		Task<ServerSideModifications> CopyDMFilesTo(string destination, CancellationToken cancellationToken);
 
 		/// <summary>
 		/// Symlinks all directories in the GameData directory to <paramref name="destination"/>
diff --git a/src/Tgstation.Server.Host/Components/ServerSideModifications.cs b/src/Tgstation.Server.Host/Components/ServerSideModifications.cs
new file mode 100644
index 0000000000..a9edcb1ddc
--- /dev/null
+++ b/src/Tgstation.Server.Host/Components/ServerSideModifications.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace Tgstation.Server.Host.Components
+{
+	/// <summary>
+	/// Represents code modifications via configuration
+	/// </summary>
+	sealed class ServerSideModifications
+	{
+		/// <summary>
+		/// If the target dme was completely overwitten
+		/// </summary>
+		public bool TotalDmeOverwrite { get; }
+
+		/// <summary>
+		/// The #include line which should be added to the beginning of the .dme if any
+		/// </summary>
+		public string HeadIncludeLine { get; }
+
+		/// <summary>
+		/// The #include line which should be added to the end of the .dme if any
+		/// </summary>
+		public string TailIncludeLine { get; }
+
+		/// <summary>
+		/// Construct <see cref="ServerSideModifications"/>
+		/// </summary>
+		/// <param name="headIncludeLine">The value of <see cref="HeadIncludeLine"/></param>
+		/// <param name="tailIncludeLine">The value of <see cref="TailIncludeLine"/></param>
+		/// <param name="totalDmeOverwrite">The value of <see cref="TotalDmeOverwrite"/></param>
+		public ServerSideModifications(string headIncludeLine, string tailIncludeLine, bool totalDmeOverwrite)
+		{
+			HeadIncludeLine = headIncludeLine;
+			TailIncludeLine = tailIncludeLine;
+			TotalDmeOverwrite = totalDmeOverwrite;
+		}
+	}
+}