refactor: ♻️ use TransformedQuery#Split for flag queries

JamesNZL · Jul 7, 2023 · 1d218ad · 1d218ad
1 parent a761e63
commit 1d218ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/TogglTrack.cs b/src/TogglTrack.cs
@@ -1194,10 +1194,12 @@ out startTimeSpan
 			}
 			else
 			{
+				(string queryToFlag, string flagQuery) = new TransformedQuery(query)
+					.Split(Settings.TimeSpanFlag)
+					.ToStrings();
+
 				bool success = TimeSpanParser.TryParse(
-					new TransformedQuery(query)
-						.After(Settings.TimeSpanFlag)
-						.ToString(),
+					flagQuery,
 					new TimeSpanParserOptions
 					{
 						UncolonedDefault = Units.Minutes,
@@ -1209,10 +1211,6 @@ out var startTimeSpan
 				{
 					if (this._settings.ShowUsageExamples)
 					{
-						string queryToFlag = new TransformedQuery(query)
-							.To(Settings.TimeSpanFlag)
-							.ToString();
-
 						results.Add(new Result
 						{
 							Title = Settings.UsageExampleTitle,
@@ -2054,10 +2052,12 @@ private async ValueTask<List<Result>> _GetEditResults(CancellationToken token, Q
 
 				if (hasTimeSpanFlag)
 				{
+					(string queryToFlag, string flagQuery) = new TransformedQuery(query)
+						.Split(Settings.TimeSpanFlag)
+						.ToStrings();
+
 					bool success = TimeSpanParser.TryParse(
-						new TransformedQuery(query)
-							.After(Settings.TimeSpanFlag)
-							.ToString(),
+						flagQuery,
 						new TimeSpanParserOptions
 						{
 							UncolonedDefault = Units.Minutes,
@@ -2074,10 +2074,6 @@ out var parsedStartTimeSpan
 					{
 						if (this._settings.ShowUsageExamples)
 						{
-							string queryToFlag = new TransformedQuery(query)
-								.To(Settings.TimeSpanFlag)
-								.ToString();
-
 							results.Add(new Result
 							{
 								Title = Settings.UsageExampleTitle,
@@ -2098,10 +2094,12 @@ out var parsedStartTimeSpan
 				}
 				if (hasTimeSpanEndFlag)
 				{
+					(string queryToFlag, string flagQuery) = new TransformedQuery(query)
+						.Split(Settings.TimeSpanEndFlag)
+						.ToStrings();
+
 					bool success = TimeSpanParser.TryParse(
-						new TransformedQuery(query)
-							.After(Settings.TimeSpanEndFlag)
-							.ToString(),
+						flagQuery,
 						new TimeSpanParserOptions
 						{
 							UncolonedDefault = Units.Minutes,
@@ -2118,10 +2116,6 @@ out var parsedEndTimeSpan
 					{
 						if (this._settings.ShowUsageExamples)
 						{
-							string queryToFlag = new TransformedQuery(query)
-								.To(Settings.TimeSpanEndFlag)
-								.ToString();
-
 							results.Add(new Result
 							{
 								Title = Settings.UsageExampleTitle,

diff --git a/src/TransformedQuery.cs b/src/TransformedQuery.cs
@@ -100,6 +100,11 @@ public TransformedQuery Between(int start, string to)
 			);
 		}
 
+		public (TransformedQuery, TransformedQuery) Split(string term)
+		{
+			return this.Split(this.IndexOf(term));
+		}
+
 		public TransformedQuery RemoveAll(string term)
 		{
 			this.SearchTerms = this.SearchTerms.Where(searchTerm => searchTerm != term).ToArray();