Skip to content

Commit

Permalink
Move implementations of stream adapters to cpp files
Browse files Browse the repository at this point in the history
  • Loading branch information
deniskovalchuk committed Jul 19, 2023
1 parent 0913f16 commit 00a630a
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 39 deletions.
2 changes: 2 additions & 0 deletions src/ftp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ add_library(ftp
stream/binary_istream.hpp
stream/binary_ostream.hpp
stream/input_stream.hpp
stream/istream_adapter.cpp
stream/istream_adapter.hpp
stream/ostream_adapter.cpp
stream/ostream_adapter.hpp
stream/output_stream.hpp)

Expand Down
51 changes: 51 additions & 0 deletions src/ftp/stream/istream_adapter.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* MIT License
*
* Copyright (c) 2023 Denis Kovalchuk
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#include "istream_adapter.hpp"
#include "../ftp_exception.hpp"

namespace ftp
{

istream_adapter::istream_adapter(std::istream & src)
: src_(src)
{}

size_t istream_adapter::read(char *buf, size_t size)
{
if (src_.eof())
return 0;

if (!src_.read(buf, size))
{
if (!src_.eof())
{
throw ftp_exception("Cannot read stream.");
}
}

return src_.gcount();
}

} // namespace ftp
21 changes: 2 additions & 19 deletions src/ftp/stream/istream_adapter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#define FTP_ISTREAM_ADAPTER_HPP

#include "input_stream.hpp"
#include "../ftp_exception.hpp"
#include <istream>

namespace ftp
Expand All @@ -35,25 +34,9 @@ namespace ftp
class istream_adapter : public input_stream
{
public:
explicit istream_adapter(std::istream & src)
: src_(src)
{}
explicit istream_adapter(std::istream & src);

size_t read(char *buf, size_t size) override
{
if (src_.eof())
return 0;

if (!src_.read(buf, size))
{
if (!src_.eof())
{
throw ftp_exception("Cannot read stream.");
}
}

return src_.gcount();
}
size_t read(char *buf, size_t size) override;

private:
std::istream & src_;
Expand Down
51 changes: 51 additions & 0 deletions src/ftp/stream/ostream_adapter.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* MIT License
*
* Copyright (c) 2023 Denis Kovalchuk
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#include "ostream_adapter.hpp"
#include "../ftp_exception.hpp"

namespace ftp
{

ostream_adapter::ostream_adapter(std::ostream & dst)
: dst_(dst)
{}

void ostream_adapter::write(char *buf, size_t size)
{
if (!dst_.write(buf, size))
{
throw ftp_exception("Cannot write stream.");
}
}

void ostream_adapter::flush()
{
if (!dst_.flush())
{
throw ftp_exception("Cannot flush stream.");
}
}

} // namespace ftp
25 changes: 5 additions & 20 deletions src/ftp/stream/ostream_adapter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#define FTP_OSTREAM_ADAPTER_HPP

#include "output_stream.hpp"
#include "../ftp_exception.hpp"
#include <ostream>

namespace ftp
Expand All @@ -35,25 +34,11 @@ namespace ftp
class ostream_adapter : public output_stream
{
public:
explicit ostream_adapter(std::ostream & dst)
: dst_(dst)
{}

void write(char *buf, size_t size) override
{
if (!dst_.write(buf, size))
{
throw ftp_exception("Cannot write stream.");
}
}

void flush() override
{
if (!dst_.flush())
{
throw ftp_exception("Cannot flush stream.");
}
}
explicit ostream_adapter(std::ostream & dst);

void write(char *buf, size_t size) override;

void flush() override;

private:
std::ostream & dst_;
Expand Down

0 comments on commit 00a630a

Please sign in to comment.