Dequeue when message full with current paragraph

ButterscotchV · Jan 31, 2024 · 09961d9 · 09961d9
1 parent 687d9f6
commit 09961d9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/ButterSTT.Tests/MessageSystem/MessageQueueTests.cs b/ButterSTT.Tests/MessageSystem/MessageQueueTests.cs
@@ -154,6 +154,38 @@ public void PageRealtimeHardWordPersistTest()
             Assert.Equal("that is just now finished!", curMessage);
         }
 
+        [Fact()]
+        public void PageRealtimeWordTest()
+        {
+            var queue = new MessageQueue
+            {
+                MessageLength = 26,
+                DequeueSystem = DequeueSystems.Pagination,
+                RealtimeQueuePadding = 0,
+                WordTime = TimeSpan.Zero,
+                HardWordTime = TimeSpan.MaxValue
+            };
+
+            var firstMessage = "Testing the queue system.";
+            queue.CurParagraph = EnglishTextParser.ParseParagraph(firstMessage);
+            queue.FinishCurrentParagraph();
+            var curMessage = queue.GetCurrentMessage();
+            _output.WriteLine($"First message: \"{curMessage}\"");
+            Assert.Equal(firstMessage, curMessage);
+
+            var secondMessage = "Second test.";
+            queue.CurParagraph = EnglishTextParser.ParseParagraph(secondMessage);
+            curMessage = queue.GetCurrentMessage();
+            _output.WriteLine($"Second message: \"{curMessage}\"");
+            Assert.Equal($"-system. {secondMessage}", curMessage);
+
+            var thirdMessage = "Third test.";
+            queue.CurParagraph = EnglishTextParser.ParseParagraph(thirdMessage);
+            curMessage = queue.GetCurrentMessage();
+            _output.WriteLine($"Second message expired: \"{curMessage}\"");
+            Assert.Equal($"-system. {thirdMessage}", curMessage);
+        }
+
         [Theory()]
         [InlineData(DequeueSystems.Scrolling)]
         [InlineData(DequeueSystems.Pagination)]

diff --git a/ButterSTT/MessageSystem/MessageQueue.cs b/ButterSTT/MessageSystem/MessageQueue.cs
@@ -297,16 +297,18 @@ private void ExpireWords()
         }
 
         private bool IsMessageFull =>
-            _wordQueue.TryPeek(out var word) && _curMessageLength + word.Length > MessageLength;
+            (_wordQueue.TryPeek(out var word) && word.Length > AvailableMessageLength)
+            || ParagraphWordEnumerator().Select(w => w.Length).FirstOrDefault(0)
+                > AvailableMessageLength;
 
         private void PaginateWords()
         {
             var lastWord = _messageWordQueue.Last();
             var hardExpired = DateTime.UtcNow >= lastWord.HardExpiryTime;
             // Wait until the last word on the full page is expired
             if (
-                (!hardExpired || _hadTextLast)
-                && (!IsMessageFull || DateTime.UtcNow < lastWord.ExpiryTime)
+                _hadTextLast
+                || (!hardExpired && (DateTime.UtcNow < lastWord.ExpiryTime || !IsMessageFull))
             )
                 return;