Skip to content

Commit

Permalink
refactor(view): ♻️ rename durations -> spans
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesNZL committed May 15, 2023
1 parent 4c78d72 commit cdfdf43
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions src/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ public class Settings
internal const string EditProjectFlag = "-p";
internal const string TimeSpanFlag = "-t";

internal enum ViewDurationKeys
internal enum ViewSpanKeys
{
Day,
Week,
Month,
Year,
}
internal static readonly Dictionary<Settings.ViewDurationKeys, CommandArgument> ViewDurationArguments = new Dictionary<Settings.ViewDurationKeys, CommandArgument>
internal static readonly Dictionary<Settings.ViewSpanKeys, CommandArgument> ViewSpanArguments = new Dictionary<Settings.ViewSpanKeys, CommandArgument>
{
{
Settings.ViewDurationKeys.Day,
Settings.ViewSpanKeys.Day,
new CommandArgument
{
Argument = "day",
Expand All @@ -38,7 +38,7 @@ internal enum ViewDurationKeys
}
},
{
Settings.ViewDurationKeys.Week,
Settings.ViewSpanKeys.Week,
new CommandArgument
{
Argument = "week",
Expand All @@ -47,7 +47,7 @@ internal enum ViewDurationKeys
}
},
{
Settings.ViewDurationKeys.Month,
Settings.ViewSpanKeys.Month,
new CommandArgument
{
Argument = "month",
Expand All @@ -56,7 +56,7 @@ internal enum ViewDurationKeys
}
},
{
Settings.ViewDurationKeys.Year,
Settings.ViewSpanKeys.Year,
new CommandArgument
{
Argument = "year",
Expand Down
20 changes: 10 additions & 10 deletions src/TogglTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1337,30 +1337,30 @@ internal async ValueTask<List<Result>> RequestViewReports(CancellationToken toke
}

/*
* Report duration selection --- tgl view [day | week | month | year]
* Report span selection --- tgl view [day | week | month | year]
*/
if (query.SearchTerms.Length == 1 || !Settings.ViewDurationArguments.Values.ToList().Exists(duration => duration.Argument == query.SearchTerms[1]))
if (query.SearchTerms.Length == 1 || !Settings.ViewSpanArguments.Values.ToList().Exists(span => span.Argument == query.SearchTerms[1]))
{
var durations = Settings.ViewDurationArguments.Values.ToList().ConvertAll(duration =>
var spans = Settings.ViewSpanArguments.Values.ToList().ConvertAll(span =>
{
return new Result
{
Title = duration.Argument,
SubTitle = $"View tracked time report for {duration.Interpolation}",
Title = span.Argument,
SubTitle = $"View tracked time report for {span.Interpolation}",
IcoPath = "view.png",
AutoCompleteText = $"{query.ActionKeyword} {Settings.ViewCommand} {duration.Argument} ",
Score = duration.Score,
AutoCompleteText = $"{query.ActionKeyword} {Settings.ViewCommand} {span.Argument} ",
Score = span.Score,
Action = c =>
{
this._context.API.ChangeQuery($"{query.ActionKeyword} {Settings.ViewCommand} {duration.Argument} ", true);
this._context.API.ChangeQuery($"{query.ActionKeyword} {Settings.ViewCommand} {span.Argument} ", true);
return false;
},
};
});

return (string.IsNullOrWhiteSpace(query.SecondToEndSearch))
? durations
: durations.FindAll(result =>
? spans
: spans.FindAll(result =>
{
return this._context.API.FuzzySearch(query.SecondToEndSearch, result.Title).Score > 0;
});
Expand Down

0 comments on commit cdfdf43

Please sign in to comment.