feat(ux): ✨ implement flag escaping (#67)

JamesNZL · Jun 23, 2023 · 8a657d3 · 8a657d3
1 parent d499a9b
commit 8a657d3
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 57 deletions.
diff --git a/src/Main.cs b/src/Main.cs
@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -36,6 +37,16 @@ public static string ExtractFromQuery(Query query, int index)
 				: string.Join(" ", query.SearchTerms.Skip(index));
 		}
 
+		public static string ReplaceSearchBackslashes(string search)
+		{
+			return Regex.Replace(search, @"(\\(?!\\))", string.Empty);
+		}
+
+		public static string EscapePotentialFlags(string description)
+		{
+			return Regex.Replace(description, @" -", @" \-");
+		}
+
 		/// <summary>
 		/// Runs on plugin initialisation.
 		/// Expensive operations should be performed here.

diff --git a/src/Structures.cs b/src/Structures.cs
@@ -191,24 +191,35 @@ public TimeEntry(DetailedReportTimeEntryResponse timeEntryResponse, DetailedRepo
 			this.Project = this._me.GetProject(this.ProjectId);
 		}
 
-		public string? GetRawDescription(bool withTrailingSpace = false)
+		public string? GetRawDescription(bool withTrailingSpace = false, bool escapePotentialFlags = false)
 		{
 			if (string.IsNullOrEmpty(this._rawDescription))
 			{
 				return string.Empty;
 			}
 
+			string rawDescription = (escapePotentialFlags)
+				? Main.EscapePotentialFlags(this._rawDescription)
+				: this._rawDescription;
+
 			if (!withTrailingSpace)
 			{
-				return this._rawDescription;
+				return rawDescription;
 			}
 
-			return $"{this._rawDescription} ";
+			return $"{rawDescription} ";
 		}
 
-		public string Description
+		public string GetDescription(bool escapePotentialFlags = false)
 		{
-			get => (string.IsNullOrEmpty(this._rawDescription)) ? "(no description)" : this._rawDescription;
+			if (string.IsNullOrEmpty(this._rawDescription))
+			{
+				return "(no description)";
+			}
+
+			return (escapePotentialFlags)
+				? Main.EscapePotentialFlags(this._rawDescription)
+				: this._rawDescription;
 		}
 
 		public DateTimeOffset StartDate
@@ -527,24 +538,35 @@ object ICloneable.Clone()
 			return this.Clone();
 		}
 
-		public string? GetRawTitle(bool withTrailingSpace = false)
+		public string? GetRawTitle(bool withTrailingSpace = false, bool escapePotentialFlags = false)
 		{
 			if (string.IsNullOrEmpty(this._rawTitle))
 			{
 				return string.Empty;
 			}
 
+			string rawTitle = (escapePotentialFlags)
+				? Main.EscapePotentialFlags(this._rawTitle)
+				: this._rawTitle;
+
 			if (!withTrailingSpace)
 			{
-				return this._rawTitle;
+				return rawTitle;
 			}
 
-			return $"{this._rawTitle} ";
+			return $"{rawTitle} ";
 		}
 
-		public string Title
+		public string GetTitle(bool escapePotentialFlags = false)
 		{
-			get => (string.IsNullOrEmpty(this._rawTitle)) ? "(no description)" : this._rawTitle;
+			if (string.IsNullOrEmpty(this._rawTitle))
+			{
+				return "(no description)";
+			}
+
+			return (escapePotentialFlags)
+				? Main.EscapePotentialFlags(this._rawTitle)
+				: this._rawTitle;
 		}
 
 		public TimeSpan Elapsed