From 633c77d7cd2dd5cd22018aca17da1490e34d94ec Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Mon, 10 Jun 2024 13:40:32 +0800
Subject: test: develop SubProcess test, fix various error.

NEED TEST: BufferStream, AutoReadStream, SubProcess.
---
 src/common/Buffer.cpp                             |  5 +++++
 src/common/String.cpp                             | 14 +++++++++++---
 src/common/SubProcess.cpp                         |  9 +++++++++
 src/common/io/Stream.cpp                          | 22 ++++++++++++++--------
 src/common/platform/unix/PosixSpawnSubProcess.cpp |  5 ++++-
 src/ui/ThemeResourceDictionary.cpp                |  2 +-
 6 files changed, 44 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/common/Buffer.cpp b/src/common/Buffer.cpp
index 49a0f8ae..af0871ca 100644
--- a/src/common/Buffer.cpp
+++ b/src/common/Buffer.cpp
@@ -12,6 +12,11 @@ void CheckSize(Index size) {
 }
 }  // namespace
 
+Buffer::Buffer() {
+  ptr_ = nullptr;
+  size_ = used_begin_ = used_end_ = 0;
+}
+
 Buffer::Buffer(Index size) {
   CheckSize(size);
   if (size == 0) {
diff --git a/src/common/String.cpp b/src/common/String.cpp
index b2e52e67..8736c775 100644
--- a/src/common/String.cpp
+++ b/src/common/String.cpp
@@ -33,11 +33,19 @@ String String::FromUtf8(const char* str, Index size) {
   Utf8CodePointIterator iter(str, size);
   for (auto cp : iter) {
     Utf16EncodeCodePointAppend(
-        cp, std::bind(&String::push_back, result, std::placeholders::_1));
+        cp, std::bind(&String::push_back, std::ref(result), std::placeholders::_1));
   }
   return result;
 }
 
+String String::FromUtf8(const std::byte* str, Index size) {
+  return String::FromUtf8(reinterpret_cast<const char*>(str), size);
+}
+
+String String::FromUtf8(const Buffer& buffer) {
+  return String::FromUtf8(buffer.GetUsedBeginPtr(), buffer.GetUsedSize());
+}
+
 String String::FromStdPath(const std::filesystem::path& path) {
   return String::FromUtf8(path.string());
 }
@@ -301,7 +309,7 @@ String& String::Trim() {
 void String::AppendCodePoint(CodePoint code_point) {
   if (!Utf16EncodeCodePointAppend(
           code_point,
-          std::bind(&String::push_back, *this, std::placeholders::_1))) {
+          std::bind(&String::push_back, this, std::placeholders::_1))) {
     throw TextEncodeException(u"Code point out of range.");
   }
 }
@@ -532,7 +540,7 @@ std::string StringView::ToUtf8() const {
   std::string result;
   for (auto cp : CodePointIterator()) {
     Utf8EncodeCodePointAppend(
-        cp, std::bind(&std::string::push_back, result, std::placeholders::_1));
+        cp, std::bind(&std::string::push_back, std::ref(result), std::placeholders::_1));
   }
   return result;
 }
diff --git a/src/common/SubProcess.cpp b/src/common/SubProcess.cpp
index fbe15859..e2738248 100644
--- a/src/common/SubProcess.cpp
+++ b/src/common/SubProcess.cpp
@@ -137,6 +137,15 @@ void PlatformSubProcessBase::SetDeleteSelfOnExit(bool enable) {
 using PlatformSubProcess = platform::unix::PosixSpawnSubProcess;
 #endif
 
+SubProcess SubProcess::Create(String program, std::vector<String> arguments,
+                              std::unordered_map<String, String> environments) {
+  SubProcessStartInfo start_info;
+  start_info.program = std::move(program);
+  start_info.arguments = std::move(arguments);
+  start_info.environments = std::move(environments);
+  return SubProcess(std::move(start_info));
+}
+
 SubProcess::SubProcess(SubProcessStartInfo start_info) {
   platform_process_.reset(new PlatformSubProcess(std::move(start_info)));
   platform_process_->Start();
diff --git a/src/common/io/Stream.cpp b/src/common/io/Stream.cpp
index 97669944..b2a67a18 100644
--- a/src/common/io/Stream.cpp
+++ b/src/common/io/Stream.cpp
@@ -58,17 +58,23 @@ Index Stream::Write(const char* buffer, Index size) {
   return Write(reinterpret_cast<const std::byte*>(buffer), size);
 }
 
-std::vector<std::byte> Stream::ReadAll() {
-  std::vector<std::byte> buffer;
-  buffer.resize(GetSize());
-  Read(buffer.data(), 0, buffer.size());
+Buffer Stream::ReadToEnd(Index grow_size) {
+  Buffer buffer(grow_size);
+  while (true) {
+    auto read = Read(buffer.GetUsedEndPtr(), buffer.GetBackFree());
+    if (read == 0) {
+      break;
+    }
+    if (buffer.IsUsedReachEnd()) {
+      buffer.ResizeBuffer(buffer.GetBufferSize() + grow_size, true);
+    }
+  }
   return buffer;
 }
 
-String Stream::ReadAllAsString() {
-  auto buffer = ReadAll();
-  return String::FromUtf8(reinterpret_cast<const char*>(buffer.data()),
-                          buffer.size());
+String Stream::ReadToEndAsUtf8String() {
+  auto buffer = ReadToEnd();
+  return String::FromUtf8(buffer);
 }
 
 void Stream::Flush() {}
diff --git a/src/common/platform/unix/PosixSpawnSubProcess.cpp b/src/common/platform/unix/PosixSpawnSubProcess.cpp
index 9b9a52ae..fba536e5 100644
--- a/src/common/platform/unix/PosixSpawnSubProcess.cpp
+++ b/src/common/platform/unix/PosixSpawnSubProcess.cpp
@@ -119,8 +119,11 @@ void PosixSpawnSubProcess::PlatformCreateProcess() {
 #endif
 
   auto exe = start_info_.program.ToUtf8();
+  std::vector<String> arguments{start_info_.program};
+  arguments.insert(arguments.cend(), start_info_.arguments.cbegin(),
+                   start_info_.arguments.cend());
 
-  auto argv = CreateCstrArray(start_info_.arguments);
+  auto argv = CreateCstrArray(arguments);
   Guard argv_guard([argv] { DestroyCstrArray(argv); });
 
   auto envp = CreateCstrArray(start_info_.environments);
diff --git a/src/ui/ThemeResourceDictionary.cpp b/src/ui/ThemeResourceDictionary.cpp
index f91fcb1c..86a19083 100644
--- a/src/ui/ThemeResourceDictionary.cpp
+++ b/src/ui/ThemeResourceDictionary.cpp
@@ -9,7 +9,7 @@ namespace cru::ui {
 std::unique_ptr<ThemeResourceDictionary> ThemeResourceDictionary::FromFile(
     const String& file_path) {
   io::CFileStream stream(file_path.ToUtf8().c_str(), "r");
-  auto xml_string = stream.ReadAllAsString();
+  auto xml_string = stream.ReadToEndAsUtf8String();
   auto parser = xml::XmlParser(xml_string);
   return std::make_unique<ThemeResourceDictionary>(parser.Parse(), false);
 }
-- 
cgit v1.2.3