Ticket #3255: t3255_prevent_replay_overwrites_v3.patch

source/ps/Replay.cpp

@@ -33 +33 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptStats.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/SimulationCommand.h"
 
+#include <ctime>
 #include <sstream>
 #include <fstream>
 #include <iomanip>
 
-#if MSC_VERSION
-#include <process.h>
-#define getpid _getpid // use the non-deprecated function name
-#endif
-
 static std::string Hexify(const std::string& s)
 {
     std::stringstream str;
     str << std::hex;
     for (size_t i = 0; i < s.size(); ++i)
@@ -63 +59 @@
     delete m_Stream;
 }
 
 void CReplayLogger::StartGame(JS::MutableHandleValue attribs)
 {
-    // Add timestamp, since the file-modification-date can change
+    // Add timestamp to the header, since the file-modification-date can change
     m_ScriptInterface.SetProperty(attribs, "timestamp", std::to_string(std::time(nullptr)));
 
-    // Add engine version and currently loaded mods for sanity checks when replaying
+    // Add engine version and currently loaded mods to the header for a compatibility check when replaying
     m_ScriptInterface.SetProperty(attribs, "engine_version", CStr(engine_version));
     m_ScriptInterface.SetProperty(attribs, "mods", g_modsLoaded);
 
-    // Construct the directory name based on the PID, to be relatively unique.
-    // Append "-1", "-2" etc if we run multiple matches in a single session,
-    // to avoid accidentally overwriting earlier logs.
-    std::wstringstream name;
-    name << getpid();
-
-    static int run = -1;
-    if (++run)
-        name << "-" << run;
+    // Get current date
+    const time_t t = time(nullptr);
+    const struct tm* now = localtime(&t);
+
+    // Construct directory name based on date and sequential number per date
+    const CStr subDirectoryFormat = "%04d-%02d-%02d_replay_%03d";
+    char subDirectory[subDirectoryFormat.length()];
+    OsPath fullPath;
+    int i = 1;
+    do {
+        sprintf(subDirectory, subDirectoryFormat.c_str(), 1900+now->tm_year, 1+now->tm_mon, now->tm_mday, i++);
+        fullPath = psLogDir() / L"sim_log" / wstring_from_utf8(CStr(subDirectory));
+    } while (DirectoryExists(fullPath) || FileExists(fullPath));
 
-    m_Directory = psLogDir() / L"sim_log" / name.str();
+    // Create directory
+    m_Directory = fullPath;
     CreateDirectories(m_Directory, 0700);
 
+    // Open commands.txt
     m_Stream = new std::ofstream(OsString(m_Directory / L"commands.txt").c_str(), std::ofstream::out | std::ofstream::trunc);
+
+    // Write header
     *m_Stream << "start " << m_ScriptInterface.StringifyJSON(attribs, false) << "\n";
 }
 
 void CReplayLogger::Turn(u32 n, u32 turnLength, std::vector<SimulationCommand>& commands)
 {

source/simulation2/Simulation2.cpp

@@ -553 +553 @@
 
     std::stringstream pid;
     pid << getpid();
     std::stringstream name;\
     name << std::setw(5) << std::setfill('0') << m_TurnNumber << ".txt";
-    OsPath path = psLogDir() / "sim_log" / pid.str() / name.str();
+    OsPath path = psLogDir() / "oos_log" / name.str();
     CreateDirectories(path.Parent(), 0700);
     std::ofstream file (OsString(path).c_str(), std::ofstream::out | std::ofstream::trunc);
 
     file << "State hash: " << std::hex;
     std::string hashRaw;