From 839cd0ec12d5fbc6d5dad31a60e2721ead603702 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Sun, 7 Mar 2021 08:55:27 +0000
Subject: [PATCH] Update the replay cache to consider modification time.

This makes the cache work consistently if replays are changed
externally.

Patch by: nwtour
Differential Revision: https://code.wildfiregames.com/D3615
This was SVN commit r25026.
---
 .../mods/public/gui/replaymenu/replay_menu.xml   |  2 +-
 source/ps/VisualReplay.cpp                       | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/binaries/data/mods/public/gui/replaymenu/replay_menu.xml b/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
index dc6f4135e0..83e68fb216 100644
--- a/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ b/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -238,7 +238,7 @@
 			<object type="button" style="StoneButton" size="40%+25 0 57%+25 100%">
 				<translatableAttribute id="caption">Rebuild Cache</translatableAttribute>
 				<translatableAttribute id="tooltip">Rebuild the replay cache from scratch. Potentially slow!</translatableAttribute>
-				<action on="Press">reloadCache();</action>
+				<action on="Press">reloadCache(); displayReplayList();</action>
 			</object>
 
 			<!-- Summary Button -->
diff --git a/source/ps/VisualReplay.cpp b/source/ps/VisualReplay.cpp
index f81c23b972..f7cb9fb415 100644
--- a/source/ps/VisualReplay.cpp
+++ b/source/ps/VisualReplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -117,8 +117,8 @@ JS::HandleObject VisualReplay::ReloadReplayCache(const ScriptInterface& scriptIn
 	TIMER(L"ReloadReplayCache");
 	ScriptRequest rq(scriptInterface);
 
-	// Maps the filename onto the index and size
-	typedef std::map<OsPath, std::pair<u32, off_t>> replayCacheMap;
+	// Maps the filename onto the index, mtime and size
+	using replayCacheMap = std::map<OsPath, std::tuple<u32, u64, off_t>>;
 
 	replayCacheMap fileList;
 
@@ -136,10 +136,12 @@ JS::HandleObject VisualReplay::ReloadReplayCache(const ScriptInterface& scriptIn
 			JS::RootedValue file(rq.cx);
 			OsPath fileName;
 			double fileSize;
+			double fileMtime;
 			scriptInterface.GetProperty(replay, "directory", fileName);
 			scriptInterface.GetProperty(replay, "fileSize", fileSize);
+			scriptInterface.GetProperty(replay, "fileMTime", fileMtime);
 
-			fileList[fileName] = std::make_pair(j, fileSize);
+			fileList[fileName] = std::make_tuple(j, fileMtime, fileSize);
 		}
 	}
 
@@ -174,7 +176,7 @@ JS::HandleObject VisualReplay::ReloadReplayCache(const ScriptInterface& scriptIn
 					continue;
 				CFileInfo fileInfo;
 				GetFileInfo(replayFile, &fileInfo);
-				if (fileInfo.Size() == it->second.second)
+				if ((u64)fileInfo.MTime() == std::get<1>(it->second) && (off_t)fileInfo.Size() == std::get<2>(it->second))
 					isNew = false;
 			}
 			else
@@ -195,13 +197,14 @@ JS::HandleObject VisualReplay::ReloadReplayCache(const ScriptInterface& scriptIn
 					rq,
 					&replayData,
 					"directory", directory.string(),
+					"fileMTime", static_cast<double>(fileInfo.MTime()),
 					"fileSize", static_cast<double>(fileInfo.Size()));
 			}
 			JS_SetElement(rq.cx, replays, i++, replayData);
 			newReplays = true;
 		}
 		else
-			copyFromOldCache.push_back(it->second.first);
+			copyFromOldCache.push_back(std::get<0>(it->second));
 	}
 
 	debug_printf(
@@ -411,6 +414,7 @@ JS::Value VisualReplay::LoadReplayData(const ScriptInterface& scriptInterface, c
 		&replayData,
 		"directory", directory.string(),
 		"fileSize", static_cast<double>(fileSize),
+		"fileMTime", static_cast<double>(fileInfo.MTime()),
 		"duration", duration);
 
 	scriptInterface.SetProperty(replayData, "attribs", attribs);