General: Add Log fallback to Temp directories

Parik27 · Nov 6, 2021 · 15e8850 · 15e8850
1 parent 6c472d5
commit 15e8850
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/build-count.txt b/build-count.txt
@@ -1 +1 @@
-510
+511
diff --git a/src/common/common.cc b/src/common/common.cc
@@ -92,11 +92,15 @@ GetGameDirRelativePathA (const char *subpath)
 /*******************************************************/
 std::string
 Common::GetRainbomizerFileName (const std::string &name,
-                                const std::string &subdirs)
+                                const std::string &subdirs, bool temp)
 {
     std::string baseDir
         = GetGameDirRelativePathA (("rainbomizer/" + subdirs).c_str ());
 
+    if (temp)
+        baseDir = std::filesystem::temp_directory_path ().string ()
+                  + "/rainbomizer/" + subdirs;
+
     std::error_code ec;
     std::filesystem::create_directories (baseDir, ec);
 
@@ -106,10 +110,16 @@ Common::GetRainbomizerFileName (const std::string &name,
 /*******************************************************/
 FILE *
 Common::GetRainbomizerFile (const std::string &name, const std::string &mode,
-                            const std::string &subdirs)
+                            const std::string &subdirs, bool tempFallback)
 {
-    return fopen (GetRainbomizerFileName (name, subdirs).c_str (),
-                  mode.c_str ());
+    FILE *file = fopen (GetRainbomizerFileName (name, subdirs).c_str (),
+                        mode.c_str ());
+
+    if (!file && tempFallback)
+        return fopen (GetRainbomizerFileName (name, subdirs, true).c_str (),
+                      mode.c_str ());
+
+    return file;
 }
 
 /*******************************************************/

diff --git a/src/common/common.hh b/src/common/common.hh
@@ -23,11 +23,13 @@ public:
     static const std::vector<uint32_t> &GetPedHashes ();
 
     static std::string GetRainbomizerFileName (const std::string &name,
-                                               const std::string &subdirs = "");
+                                               const std::string &subdirs = "",
+                                               bool               temp = false);
 
     static FILE *GetRainbomizerFile (const std::string &name,
                                      const std::string &mode,
-                                     const std::string &subdirs = "");
+                                     const std::string &subdirs      = "",
+                                     bool               tempFallback = false);
 
     static FILE *GetRainbomizerDataFile (const std::string &name,
                                          const std::string &mode = "r");

diff --git a/src/common/logger.cc b/src/common/logger.cc
@@ -49,15 +49,10 @@ Logger::GetLogFile ()
     if (!mFile)
         {
             mFile = Common::GetRainbomizerFile (GetTimeNow () + ".txt", "a+",
-                                                "logs/");
+                                                "logs/", true);
             if (!mFile)
                 {
-                    MessageBox (NULL,
-                                "Failed to open log file for writing.\n\nAllow "
-                                "write permissions for the GTA V Directory to "
-                                "allow Rainbomizer to work properly.\n\nRight "
-                                "click on the Game Folder > Properties > "
-                                "General > Uncheck Read Only.",
+                    MessageBox (NULL, "Failed to open log file for writing.",
                                 "Error", MB_ICONHAND);
                     mFile = stdout;
                 }

diff --git a/src/mission/missions_Flow.hh b/src/mission/missions_Flow.hh
@@ -13,11 +13,6 @@
 
 class MissionRandomizer_Flow
 {
-    FILE *mStartCoordsFile
-        = Rainbomizer::Common::GetRainbomizerFile ("startCoords.txt", "a");
-    FILE *mEndCoordsFile
-        = Rainbomizer::Common::GetRainbomizerFile ("endCoords.txt", "a");
-
     const MissionInfo *OriginalMission   = nullptr;
     const MissionInfo *RandomizedMission = nullptr;