src/Logger/Logger.cpp

@@ -16,10 +16,7 @@
 
 #include <iostream>
 
-#include <Corrade/Containers/Optional.h>
-#include <Corrade/Containers/Pair.h>
 #include <Corrade/Utility/Debug.h>
-#include <Corrade/Utility/Path.h>
 
 #include "Logger.h"
 
@@ -36,13 +33,12 @@ Logger::instance() {
 
 void
 Logger::initialise() {
-    auto exe_path = Utility::Path::split(*Utility::Path::executableLocation()).first();
-    _logFile.open(Utility::Path::join(exe_path, "SaveToolLog.txt").cbegin(), std::ios::trunc);
 #ifndef SAVETOOL_DEBUG_BUILD
+    _logFile.open("SaveToolLog.txt", std::ios::trunc);
     _logFile << "In case you encounter a bug:\n" <<
                 "1. Do not run the Save Tool again, as this log will be cleared.\n" <<
                 "2. Go to either the official Sekai Project Discord guild, or the community M.A.S.S. Builder one.\n" <<
-                "3. Mention me (@williamjcm) to get my attention, with a description of the bug.\n"
+                "3. Mention me (William JCM#2301) to get my attention, with a description of the bug.\n"
                 "   Please include as many details as possible, I don't want to play \"20 questions\", and neither do you.\n" <<
                 "4. Send me this file _when I ask for it_, preferably in DMs.\n" <<
                 std::endl;
@@ -63,19 +59,31 @@ Logger::unindent() {
 
 void
 Logger::log(EntryType type, StringView location, StringView message) {
-    Debug d{&_logFile};
+    Debug d{
+        #ifndef SAVETOOL_DEBUG_BUILD
+        &_logFile
+        #else
+        &std::cout
+        #endif
+    };
 
+    #ifdef SAVETOOL_DEBUG_BUILD
+    #define COLOURED_TEXT(colour, text) Debug::color(Debug::Color::colour) << (text) << Debug::resetColor
+    #else
+    #define COLOURED_TEXT(colour, text) (text)
+    #endif
     switch(type) {
         case EntryType::Info:
-            d << "[   INFO]"_s;
+            d << COLOURED_TEXT(Default, "[   INFO]"_s);
             break;
         case EntryType::Warning:
-            d << "[WARNING]"_s;
+            d << COLOURED_TEXT(Yellow, "[WARNING]"_s);
             break;
         case EntryType::Error:
-            d << "[  ERROR]"_s;
+            d << COLOURED_TEXT(Red, "[  ERROR]"_s);
             break;
     }
+    #undef COLOURED_TEXT
 
     d << "["_s << Debug::nospace << location << Debug::nospace << "]";
 

src/Logger/Logger.h

@@ -18,8 +18,10 @@
 
 #include <ctime>
 
-#include <fstream>
 #include <mutex>
+#ifndef SAVETOOL_DEBUG_BUILD
+#include <fstream>
+#endif
 
 #include <Corrade/Containers/String.h>
 #include <Corrade/Containers/ArrayView.h>
@@ -58,7 +60,9 @@ class Logger {
     private:
         Logger() = default;
 
+        #ifndef SAVETOOL_DEBUG_BUILD
         std::ofstream _logFile;
+        #endif
 
         std::uint32_t _indentLevel = 0;
 

src/SaveTool/SaveTool.cpp

@@ -431,8 +431,6 @@ SaveTool::drawCheckbox(Containers::StringView label, bool value) {
 void
 SaveTool::openUri(Containers::StringView uri) {
     ShellExecuteW(nullptr, nullptr, Utility::Unicode::widen(uri.data()), nullptr, nullptr, SW_SHOWDEFAULT);
-    // TODO: have it open folders through winebrowser.exe when running using Wine/Proton.
-    //       URLs like Discord invites or Steam Browser Protocol links should be disabled entirely there.
 }
 
 void

src/SaveTool/SaveTool_Initialisation.cpp

@@ -198,17 +198,9 @@ SaveTool::findGameDataDirectory() -> bool {
 
     wchar_t* localappdata_path = nullptr;
     Containers::ScopeGuard guard{localappdata_path, CoTaskMemFree};
-    auto result = SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_DEFAULT, nullptr, &localappdata_path);
-    if(result != S_OK)
+    if(SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_NO_APPCONTAINER_REDIRECTION, nullptr, &localappdata_path) != S_OK)
     {
-        char* message_buffer = nullptr;
-        auto size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-                                   nullptr, result, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
-                                   reinterpret_cast<char*>(&message_buffer), 0, nullptr);
-        String message{message_buffer, size};
-        LocalFree(message_buffer);
-
-        _lastError = Utility::format("SHGetKnownFolderPath() failed with error code {}: {}", result, message);
+        _lastError = Utility::format("SHGetKnownFolderPath() failed with error code {}.", GetLastError());
         LOG_ERROR(_lastError);
         return false;
     }

src/main.cpp

@@ -45,7 +45,7 @@ int main(int argc, char** argv) {
         Containers::StringView locale{str};
         LOG_INFO_FORMAT("Current locale: {}", locale);
 
-        if(!locale.hasSuffix(".utf8") && !locale.hasSuffix(".65001")) {
+        if(!locale.hasSuffix(".utf8")) {
             SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
                                      "Your system doesn't support UTF-8.", nullptr);
             return EXIT_FAILURE;