From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- include/cru/common/io/FileStream.h | 13 +++++++++ include/cru/common/io/FileStream.hpp | 13 --------- include/cru/common/io/MemoryStream.h | 44 +++++++++++++++++++++++++++++++ include/cru/common/io/MemoryStream.hpp | 44 ------------------------------- include/cru/common/io/OpenFileFlag.h | 18 +++++++++++++ include/cru/common/io/OpenFileFlag.hpp | 18 ------------- include/cru/common/io/Resource.h | 8 ++++++ include/cru/common/io/Resource.hpp | 8 ------ include/cru/common/io/Stream.h | 48 ++++++++++++++++++++++++++++++++++ include/cru/common/io/Stream.hpp | 48 ---------------------------------- 10 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 include/cru/common/io/FileStream.h delete mode 100644 include/cru/common/io/FileStream.hpp create mode 100644 include/cru/common/io/MemoryStream.h delete mode 100644 include/cru/common/io/MemoryStream.hpp create mode 100644 include/cru/common/io/OpenFileFlag.h delete mode 100644 include/cru/common/io/OpenFileFlag.hpp create mode 100644 include/cru/common/io/Resource.h delete mode 100644 include/cru/common/io/Resource.hpp create mode 100644 include/cru/common/io/Stream.h delete mode 100644 include/cru/common/io/Stream.hpp (limited to 'include/cru/common/io') diff --git a/include/cru/common/io/FileStream.h b/include/cru/common/io/FileStream.h new file mode 100644 index 00000000..4f1499be --- /dev/null +++ b/include/cru/common/io/FileStream.h @@ -0,0 +1,13 @@ +#pragma once + +#ifdef CRU_PLATFORM_UNIX +#include "../platform/unix/UnixFileStream.h" +namespace cru::io { +using FileStream = platform::unix::UnixFileStream; +} +#elif CRU_PLATFORM_WINDOWS +#include "../platform/win/Win32FileStream.h" +namespace cru::io { +using FileStream = platform::win::Win32FileStream; +} +#endif diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.hpp deleted file mode 100644 index 86c4c037..00000000 --- a/include/cru/common/io/FileStream.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef CRU_PLATFORM_UNIX -#include "../platform/unix/UnixFileStream.hpp" -namespace cru::io { -using FileStream = platform::unix::UnixFileStream; -} -#elif CRU_PLATFORM_WINDOWS -#include "../platform/win/Win32FileStream.hpp" -namespace cru::io { -using FileStream = platform::win::Win32FileStream; -} -#endif diff --git a/include/cru/common/io/MemoryStream.h b/include/cru/common/io/MemoryStream.h new file mode 100644 index 00000000..a6243d67 --- /dev/null +++ b/include/cru/common/io/MemoryStream.h @@ -0,0 +1,44 @@ +#pragma once + +#include "Stream.h" + +#include + +namespace cru::io { +class CRU_BASE_API MemoryStream : public Stream { + public: + MemoryStream() = default; + MemoryStream( + std::byte* buffer, Index size, bool read_only = false, + std::function release_func = {}) + : buffer_(buffer), + size_(size), + read_only_(read_only), + release_func_(std::move(release_func)) {} + + CRU_DELETE_COPY(MemoryStream) + CRU_DELETE_MOVE(MemoryStream) + + ~MemoryStream() override; + + public: + bool CanSeek() override; + Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; + + bool CanRead() override; + Index Read(std::byte* buffer, Index offset, Index size) override; + + bool CanWrite() override; + Index Write(const std::byte* buffer, Index offset, Index size) override; + + std::byte* GetBuffer() const { return buffer_; } + Index GetSize() override { return size_; } + + private: + std::byte* buffer_ = nullptr; + Index size_ = 0; + Index position_ = 0; + bool read_only_ = false; + std::function release_func_; +}; +} // namespace cru::io diff --git a/include/cru/common/io/MemoryStream.hpp b/include/cru/common/io/MemoryStream.hpp deleted file mode 100644 index 29da7b9f..00000000 --- a/include/cru/common/io/MemoryStream.hpp +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include "Stream.hpp" - -#include - -namespace cru::io { -class CRU_BASE_API MemoryStream : public Stream { - public: - MemoryStream() = default; - MemoryStream( - std::byte* buffer, Index size, bool read_only = false, - std::function release_func = {}) - : buffer_(buffer), - size_(size), - read_only_(read_only), - release_func_(std::move(release_func)) {} - - CRU_DELETE_COPY(MemoryStream) - CRU_DELETE_MOVE(MemoryStream) - - ~MemoryStream() override; - - public: - bool CanSeek() override; - Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; - - bool CanRead() override; - Index Read(std::byte* buffer, Index offset, Index size) override; - - bool CanWrite() override; - Index Write(const std::byte* buffer, Index offset, Index size) override; - - std::byte* GetBuffer() const { return buffer_; } - Index GetSize() override { return size_; } - - private: - std::byte* buffer_ = nullptr; - Index size_ = 0; - Index position_ = 0; - bool read_only_ = false; - std::function release_func_; -}; -} // namespace cru::io diff --git a/include/cru/common/io/OpenFileFlag.h b/include/cru/common/io/OpenFileFlag.h new file mode 100644 index 00000000..b0bceddc --- /dev/null +++ b/include/cru/common/io/OpenFileFlag.h @@ -0,0 +1,18 @@ +#pragma once + +#include "../Bitmask.h" + +namespace cru::io { +namespace details { +struct OpenFileFlagTag {}; +} // namespace details +using OpenFileFlag = Bitmask; + +struct OpenFileFlags { + static constexpr OpenFileFlag Read{0x1}; + static constexpr OpenFileFlag Write{0x2}; + static constexpr OpenFileFlag Append{0x4}; + static constexpr OpenFileFlag Create{0x8}; + static constexpr OpenFileFlag ThrowOnExist{0x10}; +}; +} // namespace cru::io diff --git a/include/cru/common/io/OpenFileFlag.hpp b/include/cru/common/io/OpenFileFlag.hpp deleted file mode 100644 index 3319bb4f..00000000 --- a/include/cru/common/io/OpenFileFlag.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "../Bitmask.hpp" - -namespace cru::io { -namespace details { -struct OpenFileFlagTag {}; -} // namespace details -using OpenFileFlag = Bitmask; - -struct OpenFileFlags { - static constexpr OpenFileFlag Read{0x1}; - static constexpr OpenFileFlag Write{0x2}; - static constexpr OpenFileFlag Append{0x4}; - static constexpr OpenFileFlag Create{0x8}; - static constexpr OpenFileFlag ThrowOnExist{0x10}; -}; -} // namespace cru::io diff --git a/include/cru/common/io/Resource.h b/include/cru/common/io/Resource.h new file mode 100644 index 00000000..1d5313a6 --- /dev/null +++ b/include/cru/common/io/Resource.h @@ -0,0 +1,8 @@ +#pragma once +#include "../Base.h" + +#include + +namespace cru::io { +std::filesystem::path CRU_BASE_API GetResourceDir(); +} diff --git a/include/cru/common/io/Resource.hpp b/include/cru/common/io/Resource.hpp deleted file mode 100644 index 4fd00bdd..00000000 --- a/include/cru/common/io/Resource.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#include "../Base.hpp" - -#include - -namespace cru::io { -std::filesystem::path CRU_BASE_API GetResourceDir(); -} diff --git a/include/cru/common/io/Stream.h b/include/cru/common/io/Stream.h new file mode 100644 index 00000000..66be4468 --- /dev/null +++ b/include/cru/common/io/Stream.h @@ -0,0 +1,48 @@ +#pragma once + +#include "../Base.h" + +#include "../String.h" + +#include +#include + +namespace cru::io { +class CRU_BASE_API Stream : public Object { + public: + enum class SeekOrigin { Current, Begin, End }; + + Stream() = default; + + CRU_DELETE_COPY(Stream) + CRU_DELETE_MOVE(Stream) + + ~Stream() override = default; + + public: + virtual bool CanSeek() = 0; + virtual Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) = 0; + virtual Index Tell(); + virtual void Rewind(); + virtual Index GetSize(); + + virtual bool CanRead() = 0; + virtual Index Read(std::byte* buffer, Index offset, Index size) = 0; + virtual Index Read(std::byte* buffer, Index size); + + virtual bool CanWrite() = 0; + virtual Index Write(const std::byte* buffer, Index offset, Index size) = 0; + virtual Index Write(const std::byte* buffer, Index size); + Index Write(const char* buffer, Index offset, Index size); + Index Write(const char* buffer, Index size); + + virtual std::vector ReadAll(); + + // Utf8 encoding. + String ReadAllAsString(); + + virtual void Flush(); + + virtual void Close(); +}; +} // namespace cru::io diff --git a/include/cru/common/io/Stream.hpp b/include/cru/common/io/Stream.hpp deleted file mode 100644 index 131e82e9..00000000 --- a/include/cru/common/io/Stream.hpp +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "../Base.hpp" - -#include "../String.hpp" - -#include -#include - -namespace cru::io { -class CRU_BASE_API Stream : public Object { - public: - enum class SeekOrigin { Current, Begin, End }; - - Stream() = default; - - CRU_DELETE_COPY(Stream) - CRU_DELETE_MOVE(Stream) - - ~Stream() override = default; - - public: - virtual bool CanSeek() = 0; - virtual Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) = 0; - virtual Index Tell(); - virtual void Rewind(); - virtual Index GetSize(); - - virtual bool CanRead() = 0; - virtual Index Read(std::byte* buffer, Index offset, Index size) = 0; - virtual Index Read(std::byte* buffer, Index size); - - virtual bool CanWrite() = 0; - virtual Index Write(const std::byte* buffer, Index offset, Index size) = 0; - virtual Index Write(const std::byte* buffer, Index size); - Index Write(const char* buffer, Index offset, Index size); - Index Write(const char* buffer, Index size); - - virtual std::vector ReadAll(); - - // Utf8 encoding. - String ReadAllAsString(); - - virtual void Flush(); - - virtual void Close(); -}; -} // namespace cru::io -- cgit v1.2.3