sneed

src/render.cpp

@@ -1,17 +1,11 @@
 #include "render.h"
 
-#include <cstddef>
-#include <cstdint>
 #include <cstring>
 #include <filesystem>
 #include <format>
 #include <fstream>
 #include <string>
 
-#if _WIN32
-  #include <windows.h>
-#endif
-
 #include "log.h"
 #include "process_.h"
 #include "sdl.h"
@@ -34,31 +28,10 @@ namespace anm2ed
     auto loggerPath = Logger::path();
     auto loggerPathString = path::to_utf8(loggerPath);
 #if _WIN32
-    auto ffmpegOutputPath = loggerPath.parent_path() / "ffmpeg-output.log";
-    auto ffmpegOutputPathString = path::to_utf8(ffmpegOutputPath);
-    std::error_code ffmpegOutputRemoveError;
-    std::filesystem::remove(ffmpegOutputPath, ffmpegOutputRemoveError);
-    auto flush_ffmpeg_output = [&]()
-    {
-      std::ifstream teeFile(ffmpegOutputPath, std::ios::binary);
-      if (!teeFile) return;
-
-      std::string line;
-      bool isFirstLine = true;
-      while (std::getline(teeFile, line))
-      {
-        if (isFirstLine && line.size() >= 3 && static_cast<unsigned char>(line[0]) == 0xEF &&
-            static_cast<unsigned char>(line[1]) == 0xBB && static_cast<unsigned char>(line[2]) == 0xBF)
-          line.erase(0, 3);
-        if (!line.empty() && line.back() == '\r') line.pop_back();
-        logger.write_raw(line);
-        isFirstLine = false;
-      }
-
-      teeFile.close();
-      std::error_code removeEc;
-      std::filesystem::remove(ffmpegOutputPath, removeEc);
-    };
+    auto ffmpegTempPath = loggerPath.parent_path() / "ffmpeg_log.temp.txt";
+    auto ffmpegTempPathString = path::to_utf8(ffmpegTempPath);
+    std::error_code ffmpegTempError;
+    std::filesystem::remove(ffmpegTempPath, ffmpegTempError);
 #endif
 
     std::filesystem::path audioPath{};
@@ -143,56 +116,14 @@ namespace anm2ed
     command += " 2>&1";
 
 #if _WIN32
-    auto logCommand = std::string("& ") + command + " | Tee-Object -FilePath " + string::quote(ffmpegOutputPathString) +
-                      " -Encoding UTF8 -Append";
-    logger.command(logCommand);
-
-    auto utf8_to_wstring = [](const std::string& value)
-    {
-      if (value.empty()) return std::wstring{};
-      auto length = MultiByteToWideChar(CP_UTF8, 0, value.c_str(), -1, nullptr, 0);
-      if (length <= 0) return std::wstring{};
-      std::wstring wide(static_cast<std::size_t>(length - 1), L'\0');
-      MultiByteToWideChar(CP_UTF8, 0, value.c_str(), -1, wide.data(), length);
-      return wide;
-    };
-
-    auto base64_encode_utf16 = [](const std::wstring& input)
-    {
-      const auto* bytes = reinterpret_cast<const unsigned char*>(input.c_str());
-      auto length = input.size() * sizeof(wchar_t);
-      static constexpr char alphabet[] =
-          "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-      std::string encoded{};
-      encoded.reserve(((length + 2) / 3) * 4);
-
-      for (std::size_t i = 0; i < length;)
-      {
-        auto remaining = length - i;
-        auto octetA = bytes[i++];
-        auto octetB = remaining > 1 ? bytes[i++] : 0;
-        auto octetC = remaining > 2 ? bytes[i++] : 0;
-
-        auto triple = (static_cast<uint32_t>(octetA) << 16) | (static_cast<uint32_t>(octetB) << 8) |
-                      static_cast<uint32_t>(octetC);
-
-        encoded.push_back(alphabet[(triple >> 18) & 0x3F]);
-        encoded.push_back(alphabet[(triple >> 12) & 0x3F]);
-        encoded.push_back(remaining > 1 ? alphabet[(triple >> 6) & 0x3F] : '=');
-        encoded.push_back(remaining > 2 ? alphabet[triple & 0x3F] : '=');
-      }
-
-      return encoded;
-    };
-
-    auto script = std::wstring(L"& { ") + utf8_to_wstring(logCommand) + L" }";
-    auto encodedCommand = base64_encode_utf16(script);
-    command = "powershell -NoProfile -EncodedCommand " + string::quote(encodedCommand);
+    command = "powershell -Command \"& " + command + " | Tee-Object -FilePath " +
+              string::quote(ffmpegTempPathString) + " -Append\"";
 #else
     command += " | tee -a " + string::quote(loggerPathString);
-    logger.command(command);
 #endif
 
+    logger.command(command);
+
     Process process(command.c_str(), "w");
 
     if (!process.get())
@@ -214,7 +145,21 @@ namespace anm2ed
 
     process.close();
 #if _WIN32
-    flush_ffmpeg_output();
+    {
+      std::ifstream ffmpegLog(ffmpegTempPath, std::ios::binary);
+      if (ffmpegLog)
+      {
+        std::string line;
+        while (std::getline(ffmpegLog, line))
+        {
+          if (!line.empty() && line.back() == '\r') line.pop_back();
+          logger.write_raw(line);
+        }
+      }
+      ffmpegLog.close();
+      std::error_code removeLogError;
+      std::filesystem::remove(ffmpegTempPath, removeLogError);
+    }
 #endif
 
     audio_remove();