mirror of
https://onedev.site.tesses.net/tesses-framework
synced 2026-02-09 00:05:46 +00:00
Make streams and vfs and http shared_ptr
This commit is contained in:
@@ -4,11 +4,8 @@ using Stream = Tesses::Framework::Streams::Stream;
|
||||
using FileStream = Tesses::Framework::Streams::FileStream;
|
||||
|
||||
namespace Tesses::Framework::TextStreams {
|
||||
StreamReader::StreamReader(Stream& strm) : StreamReader(&strm, false)
|
||||
{
|
||||
|
||||
}
|
||||
StreamReader::StreamReader(std::filesystem::path path) : StreamReader(new FileStream(path,"rb"),true)
|
||||
|
||||
StreamReader::StreamReader(std::filesystem::path path) : StreamReader(std::make_shared<FileStream>(path,"rb"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -21,35 +18,30 @@ namespace Tesses::Framework::TextStreams {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
StreamReader::StreamReader(Stream* strm, bool owns) : TextReader()
|
||||
StreamReader::StreamReader(std::shared_ptr<Stream> strm) : TextReader()
|
||||
{
|
||||
this->strm = strm;
|
||||
this->owns = owns;
|
||||
}
|
||||
|
||||
Stream& StreamReader::GetStream()
|
||||
std::shared_ptr<Stream> StreamReader::GetStream()
|
||||
{
|
||||
return *(this->strm);
|
||||
return (this->strm);
|
||||
}
|
||||
|
||||
bool StreamReader::ReadBlock(std::string& str, size_t len)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
uint8_t* buff = new uint8_t[len];
|
||||
#else
|
||||
uint8_t buff[len];
|
||||
#endif
|
||||
|
||||
len = strm->ReadBlock(buff,len);
|
||||
if(len == 0) return false;
|
||||
if(len == 0) {delete buff; return false;}
|
||||
str.append((const char*)buff, len);
|
||||
#if defined(_WIN32)
|
||||
|
||||
delete buff;
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
StreamReader::~StreamReader()
|
||||
{
|
||||
if(this->owns)
|
||||
delete this->strm;
|
||||
|
||||
}
|
||||
};
|
||||
@@ -5,20 +5,16 @@ using FileStream = Tesses::Framework::Streams::FileStream;
|
||||
|
||||
namespace Tesses::Framework::TextStreams
|
||||
{
|
||||
Stream& StreamWriter::GetStream()
|
||||
std::shared_ptr<Stream> StreamWriter::GetStream()
|
||||
{
|
||||
return *(this->strm);
|
||||
return this->strm;
|
||||
}
|
||||
StreamWriter::StreamWriter(Stream& strm) : StreamWriter(&strm, false)
|
||||
StreamWriter::StreamWriter(std::shared_ptr<Stream> strm) : TextWriter()
|
||||
{
|
||||
|
||||
}
|
||||
StreamWriter::StreamWriter(Stream* strm, bool owns) : TextWriter()
|
||||
{
|
||||
this->strm = strm;
|
||||
this->owns = owns;
|
||||
}
|
||||
StreamWriter::StreamWriter(std::filesystem::path filename, bool append) : StreamWriter(new FileStream(filename, append ? "ab" : "wb"),true)
|
||||
StreamWriter::StreamWriter(std::filesystem::path filename, bool append) : StreamWriter(std::make_shared<FileStream>(filename, append ? "ab" : "wb"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -28,7 +24,5 @@ namespace Tesses::Framework::TextStreams
|
||||
}
|
||||
StreamWriter::~StreamWriter()
|
||||
{
|
||||
if(this->owns)
|
||||
delete this->strm;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user