improved group completed callback

lingarr-translate · Sep 22, 2024 · 842b414 · 842b414
1 parent 0ad250f
commit 842b414
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Lingarr.Client/src/App.vue b/Lingarr.Client/src/App.vue
@@ -25,6 +25,6 @@ onMounted(async () => {
 })
 
 onUnmounted(() => {
-    signalR.off('GroupCompleted', () => null)
+    signalR.off('GroupCompleted', () => {})
 })
 </script>
diff --git a/Lingarr.Client/src/components/layout/ContextMenu.vue b/Lingarr.Client/src/components/layout/ContextMenu.vue
@@ -57,6 +57,7 @@ function toggle() {
 
 function selectOption(option: ILanguage) {
     translateStore.translateSubtitle(subtitle, option)
+    toggle()
     tooltip.value?.showTooltip()
 }
 

diff --git a/Lingarr.Server/Hubs/ScheduleProgressHub.cs b/Lingarr.Server/Hubs/ScheduleProgressHub.cs
@@ -3,6 +3,7 @@
 using Lingarr.Server.Models;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
+using Hangfire;
 
 namespace Lingarr.Server.Hubs;
 
@@ -23,7 +24,7 @@ public async Task JoinGroup(GroupRequest request)
         var translationJob = await _dbContext.TranslationJobs
             .FirstOrDefaultAsync(translationJob => translationJob.JobId == group);
 
-        if (translationJob == null)
+        if (translationJob == null && CheckIfJobExists(request.Group))
         {
             translationJob = new TranslationJob
             {
@@ -32,10 +33,6 @@ public async Task JoinGroup(GroupRequest request)
             };
             _dbContext.TranslationJobs.Add(translationJob);
             await _dbContext.SaveChangesAsync();
-        }
-
-        if (!translationJob.Completed)
-        {
             await Groups.AddToGroupAsync(Context.ConnectionId, group);
             await Clients.Caller.SendAsync("JoinedGroup", group);
         }
@@ -50,4 +47,13 @@ public async Task LeaveGroup(GroupRequest request)
         string group = request.Group;
         await Groups.RemoveFromGroupAsync(Context.ConnectionId, group);
     }
+
+    private bool CheckIfJobExists(string jobId)
+    {
+        using (var connection = JobStorage.Current.GetConnection())
+        {
+            var job = connection.GetJobData(jobId);
+            return job != null;
+        }
+    }
 }