Read Queue State Message Directly from Server (allowing us to change …

…it in the future)
ShokoAnime · Jul 14, 2023 · 4d901dc · 4d901dc
1 parent e82d092
commit 4d901dc
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/Shoko.Desktop/ViewModel/VM_ShokoServer.cs b/Shoko.Desktop/ViewModel/VM_ShokoServer.cs
@@ -1834,22 +1834,17 @@ void updateServerStatus()
                     GeneralQueueCount = status.GeneralQueueCount;
                     ServerImageQueueCount = status.ImagesQueueCount;
 
-                    QueueStateStruct queueState = new QueueStateStruct { queueState = (QueueStateEnum)status.HashQueueStateId, extraParams = (status.HashQueueStateParams?.ToArray() ?? new string[0])  };
-                    HasherQueueState = queueState.formatMessage();
-                    HasherQueuePaused = queueState.queueState == QueueStateEnum.Paused;
-                    HasherQueueRunning = queueState.queueState != QueueStateEnum.Paused;
-
-                    queueState.queueState = (QueueStateEnum)status.GeneralQueueStateId;
-                    queueState.extraParams = status.GeneralQueueStateParams?.ToArray() ?? new string[0];
-                    GeneralQueueState = queueState.formatMessage();
-                    GeneralQueuePaused = queueState.queueState == QueueStateEnum.Paused;
-                    GeneralQueueRunning = queueState.queueState != QueueStateEnum.Paused;
-
-                    queueState.queueState = (QueueStateEnum)status.ImagesQueueStateId;
-                    queueState.extraParams = status.ImagesQueueStateParams?.ToArray() ?? new string[0];
-                    ServerImageQueueState = queueState.formatMessage();
-                    ServerImageQueuePaused = queueState.queueState == QueueStateEnum.Paused;
-                    ServerImageQueueRunning = queueState.queueState != QueueStateEnum.Paused;
+                    HasherQueueState = status.HashQueueMessage;
+                    HasherQueuePaused = (QueueStateEnum)status.HashQueueStateId == QueueStateEnum.Paused;
+                    HasherQueueRunning = (QueueStateEnum)status.HashQueueStateId != QueueStateEnum.Paused;
+
+                    GeneralQueueState = status.GeneralQueueMessage;
+                    GeneralQueuePaused = (QueueStateEnum)status.GeneralQueueStateId == QueueStateEnum.Paused;
+                    GeneralQueueRunning = (QueueStateEnum)status.GeneralQueueStateId != QueueStateEnum.Paused;
+
+                    ServerImageQueueState = status.ImagesQueueMessage;
+                    ServerImageQueuePaused = (QueueStateEnum)status.ImagesQueueStateId == QueueStateEnum.Paused;
+                    ServerImageQueueRunning = (QueueStateEnum)status.ImagesQueueStateId != QueueStateEnum.Paused;
 
                     IsBanned = status.IsBanned;
                     BanReason = status.BanReason;