mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-21 01:24:21 +00:00
Code Activity

Replaced some clumsy buffer handling code in the TracktionMarketplaceStatus class

Browse source
This commit is contained in:
jules 2018-12-22 14:32:51 +00:00
parent dfcc9d758e
commit 536d7ed6d2
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/juce_product_unlocking/marketplace/juce_TracktionMarketplaceStatus.cpp
View file

@ -62,37 +62,19 @@ String TracktionMarketplaceStatus::readReplyFromWebserver (const String& email,
if (stream->connect (nullptr))
{
auto* thread = Thread::getCurrentThread();
auto thread = Thread::getCurrentThread();
MemoryOutputStream result;
if (thread->threadShouldExit() || stream->isError())
return {};
auto contentLength = stream->getTotalLength();
auto downloaded = 0;
const size_t bufferSize = 0x8000;
HeapBlock<char> buffer (bufferSize);
while (! (stream->isExhausted() || stream->isError() || thread->threadShouldExit()))
while (! (stream->isExhausted() || stream->isError()
|| (thread != nullptr && thread->threadShouldExit())))
{
auto max = jmin ((int) bufferSize, contentLength < 0 ? std::numeric_limits<int>::max()
: static_cast<int> (contentLength - downloaded));
auto bytesRead = result.writeFromInputStream (*stream, 8192);
auto actualBytesRead = stream->read (buffer.get() + downloaded, max - downloaded);
if (actualBytesRead < 0 || thread->threadShouldExit() || stream->isError())
break;
downloaded += actualBytesRead;
if (downloaded == contentLength)
if (bytesRead < 0)
break;
}
if (thread->threadShouldExit() || stream->isError() || (contentLength > 0 && downloaded < contentLength))
return {};
return { CharPointer_UTF8 (buffer.get()), static_cast<size_t> (downloaded) };
return result.toString();
}
return {};