Update textthread.cpp

This commit is contained in:
恍兮惚兮 2024-09-02 17:21:50 +08:00
parent de10b46b30
commit fa45bfac5c

View File

@ -12,16 +12,17 @@ static bool RemoveRepetition(std::wstring& text)
return false;
}
TextThread::TextThread(ThreadParam tp, HookParam hp, std::optional<std::wstring> name) :
handle(threadCounter++),
TextThread::TextThread(ThreadParam tp, HookParam hp, std::optional<std::wstring> name) : handle(threadCounter++),
name(name.value_or(StringToWideString(hp.name))),
tp(tp),
hp(hp)
{}
{
}
void TextThread::Start()
{
CreateTimerQueueTimer(&timer, NULL, [](void* This, auto) { ((TextThread*)This)->Flush(); }, this, 10, 10, WT_EXECUTELONGFUNCTION);
CreateTimerQueueTimer(&timer, NULL, [](void *This, auto)
{ ((TextThread *)This)->Flush(); }, this, 10, 10, WT_EXECUTELONGFUNCTION);
}
void TextThread::Stop()
@ -36,7 +37,8 @@ void TextThread::AddSentence(std::wstring sentence)
void TextThread::Push(BYTE *data, int length)
{
if (length < 0) return;
if (length < 0)
return;
std::scoped_lock lock(bufferMutex);
BYTE doubleByteChar[2];
@ -60,15 +62,19 @@ void TextThread::Push(BYTE* data, int length)
if (converted)
{
buffer.append(converted.value());
if (hp.type & FULL_STRING && converted.value().size()>1) buffer.push_back(L'\n');
if (hp.type & FULL_STRING && converted.value().size() > 1)
buffer.push_back(L'\n');
}
else Host::AddConsoleOutput(INVALID_CODEPAGE);
else
Host::AddConsoleOutput(INVALID_CODEPAGE);
lastPushTime = GetTickCount64();
if (filterRepetition)
{
if (std::all_of(buffer.begin(), buffer.end(), [&](wchar_t ch) { return repeatingChars.find(ch) != repeatingChars.end(); })) buffer.clear();
if (std::all_of(buffer.begin(), buffer.end(), [&](wchar_t ch)
{ return repeatingChars.find(ch) != repeatingChars.end(); }))
buffer.clear();
if (RemoveRepetition(buffer)) // sentence repetition detected, which means the entire sentence has already been received
{
repeatingChars = std::unordered_set(buffer.begin(), buffer.end());
@ -77,7 +83,7 @@ void TextThread::Push(BYTE* data, int length)
}
}
if (flushDelay == 0 && hp.type & FULL_STRING)
if (flushDelay == 0) // && hp.type & FULL_STRING)
{
AddSentence(std::move(buffer));
buffer.clear();
@ -96,7 +102,8 @@ void TextThread::Flush()
{
{
auto storage = this->storage.Acquire();
if (storage->size() > maxHistorySize) storage->erase(0, storage->size() - maxHistorySize); // https://github.com/Artikash/Textractor/issues/127#issuecomment-486882983
if (storage->size() > maxHistorySize)
storage->erase(0, storage->size() - maxHistorySize); // https://github.com/Artikash/Textractor/issues/127#issuecomment-486882983
}
std::vector<std::wstring> sentences;
@ -106,11 +113,13 @@ void TextThread::Flush()
{
totalSize += sentence.size();
sentence.erase(std::remove(sentence.begin(), sentence.end(), 0), sentence.end());
if (Output(*this, sentence)) storage->append(sentence+L"\n");
if (Output(*this, sentence))
storage->append(sentence + L"\n");
}
std::scoped_lock lock(bufferMutex);
if (buffer.empty()) return;
if (buffer.empty())
return;
if (buffer.size() > maxBufferSize || GetTickCount64() - lastPushTime > flushDelay)
{
AddSentence(std::move(buffer));