move removing log file to Logger::Clear()

Rosalie241 · Jul 11, 2022 · 39cc9c6 · 39cc9c6
1 parent fc92626
commit 39cc9c6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/SporeModLoader/SporeModLoader.cpp b/SporeModLoader/SporeModLoader.cpp
@@ -22,32 +22,13 @@ bool SporeModLoader::Initialize()
 {
     try
     {
-        std::wstring errorMessage;
-        std::filesystem::path logFilePath;
-
-        logFilePath = Path::GetLogFilePath();
-
-        // remove log file if it exists
-        if (std::filesystem::exists(logFilePath))
-        {
-            try
-            {
-                std::filesystem::remove(logFilePath);
-            }
-            catch (...)
-            {
-                errorMessage = L"std::filesystem::remove(\"";
-                errorMessage += logFilePath.wstring();
-                errorMessage += L"\") Failed!";
-                UI::ShowErrorMessage(errorMessage);
-                throw std::exception();
-            }
-        }
-
+        Logger::Clear();
+
         for (const auto& path : { Path::GetCoreLibsPath(), Path::GetModLibsPath() })
         {
             if (!std::filesystem::is_directory(path))
             {
+                std::wstring errorMessage;
                 errorMessage = L"\"";
                 errorMessage += path.wstring();
                 errorMessage += L"\" doesn't exist!";

diff --git a/SporeModLoader/SporeModLoaderHelpers.cpp b/SporeModLoader/SporeModLoaderHelpers.cpp
@@ -97,6 +97,29 @@ std::filesystem::path Path::GetModLibsPath(void)
     return modLibsPath;
 }
 
+void Logger::Clear(void)
+{
+    std::filesystem::path logFilePath;
+
+    logFilePath = Path::GetLogFilePath();
+
+    if (std::filesystem::exists(logFilePath))
+    {
+        try
+        {
+            std::filesystem::remove(logFilePath);
+        }
+        catch (...)
+        {
+            std::wstring errorMessage;
+            errorMessage = L"std::filesystem::remove(\"";
+            errorMessage += logFilePath.wstring();
+            errorMessage += L"\") Failed!";
+            UI::ShowErrorMessage(errorMessage);
+            throw std::exception();
+        }
+    }
+}
 
 void Logger::AddMessage(std::wstring message)
 {
@@ -150,7 +173,7 @@ bool Library::LoadAllInPath(std::filesystem::path path)
     return true;
 }
 
-Game::GameVersion SporeModLoaderHelpers::Game::GetCurrentVersion(void)
+Game::GameVersion Game::GetCurrentVersion(void)
 {
     std::filesystem::path currentExecutablePath;
     uintmax_t currentFileSize;

diff --git a/SporeModLoader/SporeModLoaderHelpers.hpp b/SporeModLoader/SporeModLoaderHelpers.hpp
@@ -45,6 +45,11 @@ namespace SporeModLoaderHelpers
 
     namespace Logger
     {
+        /// <summary>
+        ///     Clears log file
+        /// </summary>
+        void Clear(void);
+
         /// <summary>
         ///     Adds message to the log file
         /// </summary>