feat(ux): 🚸 implement -l list flag for continue (#98)

JamesNZL · Jul 6, 2023 · 1f57cd9 · 1f57cd9
1 parent 10dab82
commit 1f57cd9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/Settings.cs b/src/Settings.cs
@@ -32,6 +32,7 @@ public class Settings
 		internal const string ClearDescriptionFlag = "-C";
 		internal const string TimeSpanFlag = "-t";
 		internal const string TimeSpanEndFlag = "-T";
+		internal const string ListPastFlag = "-l";
 		internal const string ShowStopFlag = "-S";
 
 		internal const string NoProjectName = "No Project";

diff --git a/src/TogglTrack.cs b/src/TogglTrack.cs
@@ -569,9 +569,7 @@ internal List<Result> NotifyUnknownError()
 
 		internal async ValueTask<List<Result>> RequestResults(CancellationToken token, Query query)
 		{
-			bool emptyQuery = (string.IsNullOrEmpty(query.Search));
-
-			if (emptyQuery)
+			if (string.IsNullOrEmpty(query.Search))
 			{
 				this.RefreshCache(force: false);
 
@@ -606,11 +604,6 @@ internal async ValueTask<List<Result>> RequestResults(CancellationToken token, Q
 				// Add results to start time entry
 				results.AddRange(await this._GetStartResults(token, query));
 
-				if (emptyQuery)
-				{
-					return results;
-				}
-
 				// Add previously matching time entries
 				results.AddRange(await this._GetContinueResults(token, query));
 
@@ -1579,6 +1572,11 @@ private async ValueTask<List<Result>> _GetStopResults(CancellationToken token, Q
 
 		private async ValueTask<List<Result>> _GetContinueResults(CancellationToken token, Query query)
 		{
+			if (string.IsNullOrEmpty(query.Search))
+			{
+				return new List<Result>();
+			}
+
 			var me = (await this._GetMe(token))?.ToMe();
 			if (me is null)
 			{
@@ -1592,8 +1590,11 @@ private async ValueTask<List<Result>> _GetContinueResults(CancellationToken toke
 			}
 
 			string entriesQuery = new TransformedQuery(query)
+				.RemoveAll(Settings.ListPastFlag)
 				.ToString(TransformedQuery.Escaping.Unescaped);
 
+			bool emptyQuery = string.IsNullOrEmpty(entriesQuery);
+
 			return timeEntries.Groups.Values.SelectMany(project =>
 			{
 				if (project.SubGroups is null)
@@ -1602,7 +1603,7 @@ private async ValueTask<List<Result>> _GetContinueResults(CancellationToken toke
 				}
 
 				return project.SubGroups.Values
-					.Where(timeEntry => (
+					.Where(timeEntry => emptyQuery || (
 						(
 							project.Project?.Id != this._state.SelectedIds.Project ||
 							timeEntry.GetRawTitle() != entriesQuery