mewin/mijin2
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Added Stream::copyTo() and fixed read flag in FileStream::getFeatures().

Browse Source 
Made throwOnError() throw Exception instead of std::runtime_error.
This commit is contained in:
Patrick Wuttke 2025-09-22 21:41:31 +02:00
parent 10d9b4c98f
commit 32ccaad00a
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/mijin/io/stream.cpp
View File

@ -290,6 +290,29 @@ mijin::Task<StreamError> Stream::c_readLine(std::string& outString)
co_return StreamError::SUCCESS; co_return StreamError::SUCCESS;
} }
StreamError Stream::copyTo(Stream& other)
{
MIJIN_ASSERT(getFeatures().read, "Stream must support reading.");
MIJIN_ASSERT(other.getFeatures().write, "Other stream must support writing.");
static constexpr std::size_t CHUNK_SIZE = 4096;
std::array<std::byte, CHUNK_SIZE> chunk = {};
while (!isAtEnd())
{
std::size_t bytesRead = 0;
if (const StreamError error = readRaw(chunk, {.partial = true}, &bytesRead); error != StreamError::SUCCESS)
{
return error;
}
if (const StreamError error = other.writeRaw(chunk.data(), bytesRead); error != StreamError::SUCCESS)
{
return error;
}
}
return StreamError::SUCCESS;
}
FileStream::~FileStream() FileStream::~FileStream()
{ {
if (handle) { if (handle) {
@ -441,7 +464,7 @@ StreamFeatures FileStream::getFeatures()
if (handle) if (handle)
{ {
return { return {
.read = (mode == FileOpenMode::READ), .read = (mode == FileOpenMode::READ || mode == FileOpenMode::READ_WRITE),
.write = (mode == FileOpenMode::WRITE || mode == FileOpenMode::APPEND || mode == FileOpenMode::READ_WRITE), .write = (mode == FileOpenMode::WRITE || mode == FileOpenMode::APPEND || mode == FileOpenMode::READ_WRITE),
.tell = true, .tell = true,
.seek = true, .seek = true,

6
source/mijin/io/stream.hpp
View File

@ -275,6 +275,8 @@ public:
StreamError getTotalLength(std::size_t& outLength); StreamError getTotalLength(std::size_t& outLength);
StreamError copyTo(Stream& otherStream);
template<template<typename> typename TAllocator> template<template<typename> typename TAllocator>
StreamError readRest(BaseTypelessBuffer<TAllocator>& outBuffer); StreamError readRest(BaseTypelessBuffer<TAllocator>& outBuffer);
@ -544,7 +546,7 @@ inline void throwOnError(mijin::StreamError error)
if (error == mijin::StreamError::SUCCESS) { if (error == mijin::StreamError::SUCCESS) {
return; return;
} }
throw std::runtime_error(errorName(error)); throw Exception(errorName(error));
} }
inline void throwOnError(mijin::StreamError error, std::string message) inline void throwOnError(mijin::StreamError error, std::string message)
@ -552,7 +554,7 @@ inline void throwOnError(mijin::StreamError error, std::string message)
if (error == mijin::StreamError::SUCCESS) { if (error == mijin::StreamError::SUCCESS) {
return; return;
} }
throw std::runtime_error(message + ": " + errorName(error)); throw Exception(message + ": " + errorName(error));
} }
template<typename TSuccess> template<typename TSuccess>