Main: use Logger.

This commit is contained in:
Guillaume Jacquemin 2022-11-21 10:17:13 +01:00
parent bb066d3134
commit fe10bbb3f3

View file

@ -14,10 +14,6 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#ifndef SAVETOOL_DEBUG_BUILD
#include <fstream>
#endif
#include <SDL_messagebox.h> #include <SDL_messagebox.h>
#include <cpuid.h> #include <cpuid.h>
@ -26,38 +22,45 @@
#include <synchapi.h> #include <synchapi.h>
#include <winerror.h> #include <winerror.h>
#include "Logger/MagnumLogBuffer.h"
#include "SaveTool/SaveTool.h" #include "SaveTool/SaveTool.h"
int main(int argc, char** argv) { int main(int argc, char** argv) {
MagnumLogBuffer debug_intercept_buffer{EntryType::Info};
MagnumLogBuffer warning_intercept_buffer{EntryType::Warning};
MagnumLogBuffer error_intercept_buffer{EntryType::Error};
std::ostream debug_intercept_stream{&debug_intercept_buffer};
std::ostream warning_intercept_stream{&warning_intercept_buffer};
std::ostream error_intercept_stream{&error_intercept_buffer};
Debug debug_intercept{&debug_intercept_stream};
Warning warning_intercept{&warning_intercept_stream};
Error error_intercept{&error_intercept_stream};
LOG_INFO("M.A.S.S. Builder Save Tool version " SAVETOOL_VERSION);
auto str = std::setlocale(LC_ALL, ".utf-8"); auto str = std::setlocale(LC_ALL, ".utf-8");
if(str && !Containers::StringView{str}.hasSuffix(".utf8")) { if(str) {
Containers::StringView locale{str};
LOG_INFO_FORMAT("Current locale: {}", locale);
if(!locale.hasSuffix(".utf8")) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
"Your system doesn't support UTF-8.", nullptr); "Your system doesn't support UTF-8.", nullptr);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
}
#ifndef SAVETOOL_DEBUG_BUILD
std::ofstream output{"SaveToolLog.txt", std::ios::trunc|std::ios::out};
Utility::Debug d{&output};
Utility::Warning w{&output};
Utility::Error e{&output};
#else
Utility::Warning w{Utility::Debug::defaultOutput()};
Utility::Error e{Utility::Debug::defaultOutput()};
#endif
Utility::Debug{} << "M.A.S.S. Builder Save Tool version " SAVETOOL_VERSION;
auto mutex_handle = CreateMutexW(nullptr, 0, L"MassBuilderSaveTool"); auto mutex_handle = CreateMutexW(nullptr, 0, L"MassBuilderSaveTool");
if(!mutex_handle) { if(!mutex_handle) {
LOG_ERROR_FORMAT("Error initialising the instance checker. GetLastError() returned {}.", GetLastError());
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
"There was an error initialising the single-instance checker.",nullptr); "There was an error initialising the single-instance checker.",nullptr);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if(GetLastError() == ERROR_ALREADY_EXISTS) { if(GetLastError() == ERROR_ALREADY_EXISTS) {
LOG_ERROR("Another instance of the application was detected.");
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
"There can be only one running instance of the application.",nullptr); "There can be only one running instance of the application.",nullptr);
return EXIT_FAILURE; return EXIT_FAILURE;
@ -66,13 +69,13 @@ int main(int argc, char** argv) {
std::uint32_t brand[12]; std::uint32_t brand[12];
if (!__get_cpuid_max(0x80000004, nullptr)) { if (!__get_cpuid_max(0x80000004, nullptr)) {
Utility::Warning{} << "Warning: CPUID features not supported. Can't get the current processor's model."; LOG_WARNING("CPUID features not supported. Can't get the current processor's model.");
} }
else { else {
__get_cpuid(0x80000002, brand+0x0, brand+0x1, brand+0x2, brand+0x3); __get_cpuid(0x80000002, brand+0x0, brand+0x1, brand+0x2, brand+0x3);
__get_cpuid(0x80000003, brand+0x4, brand+0x5, brand+0x6, brand+0x7); __get_cpuid(0x80000003, brand+0x4, brand+0x5, brand+0x6, brand+0x7);
__get_cpuid(0x80000004, brand+0x8, brand+0x9, brand+0xa, brand+0xb); __get_cpuid(0x80000004, brand+0x8, brand+0x9, brand+0xa, brand+0xb);
Utility::Debug{} << "Processor:" << Containers::arrayCast<const char>(brand).data(); LOG_INFO_FORMAT("Processor: {}", Containers::arrayCast<const char>(brand).data());
} }
SaveTool app({argc, argv}); SaveTool app({argc, argv});