Fix client name and tags handling

eXpl0it3r · eXpl0it3r · commit 130dcc96fe8c · 2026-01-27T09:51:17.000+01:00
diff --git a/Clockify/ClockifyService.cs b/Clockify/ClockifyService.cs
@@ -85,12 +85,15 @@ public async Task<TimeEntryWithRatesDtoV1> GetRunningTimerAsync()
                 logger.LogError($"Fetching running timer failed, no project in workspace matching {_settings.ProjectName}");
                 return null;
             }
+            
+            var entry = timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id);
+            logger.LogInfo($"{string.Join(',', entry?.TagIds?.ToString())}");
 
             return timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id
                                                     && (string.IsNullOrEmpty(_settings.TimerName) || t.Description == _settings.TimerName)
                                                     && (string.IsNullOrEmpty(_settings.TaskName) || string.IsNullOrEmpty(_task?.Id) || t.TaskId == _task.Id)
-                                                    && ((t.TagIds is null && _tags is null) || t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)
-                                                        .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture)))
+                                                    && ((t.TagIds is null && _tags is null) || (t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)
+                                                        .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture))))
                                                     && t.Billable == _settings.Billable);
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
@@ -108,6 +111,9 @@ public async Task UpdateSettingsAsync(PluginSettings settings)
         
         var cacheInvalidationRequired = SettingsValidator.HasChanged(_settings, settings);
         
+        logger.LogInfo($"{settings.ApiKey}/{settings.WorkspaceName}/{settings.TaskName}/{settings.Billable}/{settings.ProjectName}/{settings.ClientName}/{settings.Tags}");
+        logger.LogInfo($"{_settings.ApiKey}/{_settings.WorkspaceName}/{_settings.TaskName}/{_settings.Billable}/{_settings.ProjectName}/{_settings.ClientName}/{_settings.Tags}");
+        
         // Do we need to recreate the client?
         if (!IsValid || _settings.ApiKey != settings.ApiKey || _settings.ServerUrl != settings.ServerUrl)
         {
@@ -135,7 +141,7 @@ public async Task UpdateSettingsAsync(PluginSettings settings)
             cacheInvalidationRequired = true;
         }
 
-        _settings = settings;
+        _settings = settings.Clone();
         
         if (cacheInvalidationRequired)
         {
@@ -187,15 +193,15 @@ private async Task ReloadCacheAsync()
             var workspaces = await _clockifyClient.V1.Workspaces.GetAsync();
             _workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);
 
-            if (_workspace != null)
+            if (_workspace is not null)
             {
-                _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName);
+                _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);
+                _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName, _client?.Id);
                 _tags = await FindMatchingTagsAsync(_workspace.Id, _settings.Tags);
 
-                if (_project != null)
+                if (_project is not null)
                 {
                     _task = await FindMatchingTaskAsync(_workspace.Id, _project.Id, _settings.TaskName);
-                    _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);
                 }
             }
             
@@ -216,7 +222,7 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()
         }
 
         var runningTimer = await GetRunningTimerAsync();
-        if (runningTimer == null)
+        if (runningTimer is null)
         {
             // No running timer
             return null;
@@ -246,9 +252,9 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()
         return runningTimer;
     }
 
-    private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName)
+    private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName, string clientId = null)
     {
-        if (string.IsNullOrEmpty(projectName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectName))
         {
             return null;
         }
@@ -262,9 +268,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st
                     q.QueryParameters.StrictNameSearch = true;
                     q.QueryParameters.PageSize = MaxPageSize;
 
-                    if (_client is not null)
+                    if (clientId is not null)
                     {
-                        q.QueryParameters.Clients = [_client.Id];
+                        q.QueryParameters.Clients = [clientId];
                     }
                 });
 
@@ -292,7 +298,7 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st
 
     private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string workspaceId, string clientName)
     {
-        if (string.IsNullOrEmpty(clientName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(clientName))
         {
             return null;
         }
@@ -317,7 +323,7 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works
 
     private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string projectId, string taskName)
     {
-        if (string.IsNullOrEmpty(taskName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectId) || string.IsNullOrEmpty(taskName))
         {
             return null;
         }
@@ -343,7 +349,7 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p
 
     private async Task<string> FindOrCreateTaskAsync(string workspaceId, string projectId, string taskName)
     {
-        if (string.IsNullOrEmpty(taskName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectId) || string.IsNullOrEmpty(taskName))
         {
             return null;
         }
@@ -374,7 +380,7 @@ private async Task<string> FindOrCreateTaskAsync(string workspaceId, string proj
 
     private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, string tags)
     {
-        if (string.IsNullOrEmpty(tags))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(tags))
         {
             return [];
         }
@@ -395,7 +401,7 @@ private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, strin
             var tagsOnWorkspace = await _clockifyClient.V1.Workspaces[workspaceId].Tags
                 .GetAsync(q => q.QueryParameters.PageSize = MaxPageSize);
 
-            return tagsOnWorkspace == null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();
+            return tagsOnWorkspace is null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
         {
diff --git a/Clockify/PluginSettings.cs b/Clockify/PluginSettings.cs
@@ -4,6 +4,24 @@ namespace Clockify;
 
 public class PluginSettings
 {
+    public PluginSettings Clone()
+    {
+        return new PluginSettings
+        {
+            ApiKey = ApiKey,
+            WorkspaceName = WorkspaceName,
+            ProjectName = ProjectName,
+            TaskName = TaskName,
+            TimerName = TimerName,
+            Tags = Tags,
+            ClientName = ClientName,
+            Billable = Billable,
+            TitleFormat = TitleFormat,
+            RefreshRate = RefreshRate,
+            ServerUrl = ServerUrl
+        };
+    }
+    
     [JsonProperty(PropertyName = "apiKey")]
     public string ApiKey { get; set; } = string.Empty;
 

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,15 @@ public async Task<TimeEntryWithRatesDtoV1> GetRunningTimerAsync()`
`85`	`85`	`logger.LogError($"Fetching running timer failed, no project in workspace matching {_settings.ProjectName}");`
`86`	`86`	`return null;`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ var entry = timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id);`
	`90`	`+ logger.LogInfo($"{string.Join(',', entry?.TagIds?.ToString())}");`
`88`	`91`
`89`	`92`	`return timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id`
`90`	`93`	`&& (string.IsNullOrEmpty(_settings.TimerName) \|\| t.Description == _settings.TimerName)`
`91`	`94`	`&& (string.IsNullOrEmpty(_settings.TaskName) \|\| string.IsNullOrEmpty(_task?.Id) \|\| t.TaskId == _task.Id)`
`92`		`- && ((t.TagIds is null && _tags is null) \|\| t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)`
`93`		`- .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture)))`
	`95`	`+ && ((t.TagIds is null && _tags is null) \|\| (t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)`
	`96`	`+ .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture))))`
`94`	`97`	`&& t.Billable == _settings.Billable);`
`95`	`98`	`}`
`96`	`99`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`@@ -108,6 +111,9 @@ public async Task UpdateSettingsAsync(PluginSettings settings)`
`108`	`111`
`109`	`112`	`var cacheInvalidationRequired = SettingsValidator.HasChanged(_settings, settings);`
`110`	`113`
	`114`	`+ logger.LogInfo($"{settings.ApiKey}/{settings.WorkspaceName}/{settings.TaskName}/{settings.Billable}/{settings.ProjectName}/{settings.ClientName}/{settings.Tags}");`
	`115`	`+ logger.LogInfo($"{_settings.ApiKey}/{_settings.WorkspaceName}/{_settings.TaskName}/{_settings.Billable}/{_settings.ProjectName}/{_settings.ClientName}/{_settings.Tags}");`
	`116`	`+`
`111`	`117`	`// Do we need to recreate the client?`
`112`	`118`	`if (!IsValid \|\| _settings.ApiKey != settings.ApiKey \|\| _settings.ServerUrl != settings.ServerUrl)`
`113`	`119`	`{`
`@@ -135,7 +141,7 @@ public async Task UpdateSettingsAsync(PluginSettings settings)`
`135`	`141`	`cacheInvalidationRequired = true;`
`136`	`142`	`}`
`137`	`143`
`138`		`- _settings = settings;`
	`144`	`+ _settings = settings.Clone();`
`139`	`145`
`140`	`146`	`if (cacheInvalidationRequired)`
`141`	`147`	`{`
`@@ -187,15 +193,15 @@ private async Task ReloadCacheAsync()`
`187`	`193`	`var workspaces = await _clockifyClient.V1.Workspaces.GetAsync();`
`188`	`194`	`_workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);`
`189`	`195`
`190`		`- if (_workspace != null)`
	`196`	`+ if (_workspace is not null)`
`191`	`197`	`{`
`192`		`- _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName);`
	`198`	`+ _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);`
	`199`	`+ _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName, _client?.Id);`
`193`	`200`	`_tags = await FindMatchingTagsAsync(_workspace.Id, _settings.Tags);`
`194`	`201`
`195`		`- if (_project != null)`
	`202`	`+ if (_project is not null)`
`196`	`203`	`{`
`197`	`204`	`_task = await FindMatchingTaskAsync(_workspace.Id, _project.Id, _settings.TaskName);`
`198`		`- _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);`
`199`	`205`	`}`
`200`	`206`	`}`
`201`	`207`
`@@ -216,7 +222,7 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()`
`216`	`222`	`}`
`217`	`223`
`218`	`224`	`var runningTimer = await GetRunningTimerAsync();`
`219`		`- if (runningTimer == null)`
	`225`	`+ if (runningTimer is null)`
`220`	`226`	`{`
`221`	`227`	`// No running timer`
`222`	`228`	`return null;`
`@@ -246,9 +252,9 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()`
`246`	`252`	`return runningTimer;`
`247`	`253`	`}`
`248`	`254`
`249`		`- private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName)`
	`255`	`+ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName, string clientId = null)`
`250`	`256`	`{`
`251`		`- if (string.IsNullOrEmpty(projectName))`
	`257`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectName))`
`252`	`258`	`{`
`253`	`259`	`return null;`
`254`	`260`	`}`
`@@ -262,9 +268,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st`
`262`	`268`	`q.QueryParameters.StrictNameSearch = true;`
`263`	`269`	`q.QueryParameters.PageSize = MaxPageSize;`
`264`	`270`
`265`		`- if (_client is not null)`
	`271`	`+ if (clientId is not null)`
`266`	`272`	`{`
`267`		`- q.QueryParameters.Clients = [_client.Id];`
	`273`	`+ q.QueryParameters.Clients = [clientId];`
`268`	`274`	`}`
`269`	`275`	`});`
`270`	`276`
`@@ -292,7 +298,7 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st`
`292`	`298`
`293`	`299`	`private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string workspaceId, string clientName)`
`294`	`300`	`{`
`295`		`- if (string.IsNullOrEmpty(clientName))`
	`301`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(clientName))`
`296`	`302`	`{`
`297`	`303`	`return null;`
`298`	`304`	`}`
`@@ -317,7 +323,7 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works`
`317`	`323`
`318`	`324`	`private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string projectId, string taskName)`
`319`	`325`	`{`
`320`		`- if (string.IsNullOrEmpty(taskName))`
	`326`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectId) \|\| string.IsNullOrEmpty(taskName))`
`321`	`327`	`{`
`322`	`328`	`return null;`
`323`	`329`	`}`
`@@ -343,7 +349,7 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p`
`343`	`349`
`344`	`350`	`private async Task<string> FindOrCreateTaskAsync(string workspaceId, string projectId, string taskName)`
`345`	`351`	`{`
`346`		`- if (string.IsNullOrEmpty(taskName))`
	`352`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectId) \|\| string.IsNullOrEmpty(taskName))`
`347`	`353`	`{`
`348`	`354`	`return null;`
`349`	`355`	`}`
`@@ -374,7 +380,7 @@ private async Task<string> FindOrCreateTaskAsync(string workspaceId, string proj`
`374`	`380`
`375`	`381`	`private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, string tags)`
`376`	`382`	`{`
`377`		`- if (string.IsNullOrEmpty(tags))`
	`383`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(tags))`
`378`	`384`	`{`
`379`	`385`	`return [];`
`380`	`386`	`}`
`@@ -395,7 +401,7 @@ private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, strin`
`395`	`401`	`var tagsOnWorkspace = await _clockifyClient.V1.Workspaces[workspaceId].Tags`
`396`	`402`	`.GetAsync(q => q.QueryParameters.PageSize = MaxPageSize);`
`397`	`403`
`398`		`- return tagsOnWorkspace == null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();`
	`404`	`+ return tagsOnWorkspace is null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();`
`399`	`405`	`}`
`400`	`406`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`401`	`407`	`{`