Replay naming

See merge request main/Sumatra!1818

sumatra-commit: acb312b249acdb61174c276fd3ab026dabbe208f

modules/moduli-autoreferee/src/integrationTest/java/edu/tigers/autoreferee/AutoRefIntegrationTest.java

@@ -107,7 +107,7 @@ public void before()
 		SumatraModel.getInstance().getModule(AutoRefModule.class).changeMode(EAutoRefMode.PASSIVE);
 
 		BerkeleyDb db = BerkeleyDb.withCustomLocation(Paths.get("../../" + BerkeleyDb.getDefaultBasePath(),
-				BerkeleyDb.getDefaultName() + "_" + name));
+				BerkeleyDb.getDefaultName("yellow", "blue") + "_" + name));
 		db.add(BerkeleyLogEvent.class, new BerkeleyAccessor<>(BerkeleyLogEvent.class, false));
 		db.add(BerkeleyShapeMapFrame.class, new BerkeleyAccessor<>(BerkeleyShapeMapFrame.class, true));
 		db.add(WorldFrameWrapper.class, new BerkeleyAccessor<>(WorldFrameWrapper.class, true));

modules/moduli-record/src/main/java/edu/tigers/sumatra/persistence/BerkeleyDb.java

@@ -90,11 +90,13 @@ private String determineFolderName(final File file)
 
 
 	/**
+	 * @param teamYellow name of yellow team
+	 * @param teamBlue   name of blue team
 	 * @return a new empty unopened database at the default location
 	 */
-	public static BerkeleyDb withDefaultLocation()
+	public static BerkeleyDb withDefaultLocation(String teamYellow, String teamBlue)
 	{
-		return new BerkeleyDb(Paths.get(getDefaultBasePath(), getDefaultName()));
+		return new BerkeleyDb(Paths.get(getDefaultBasePath(), getDefaultName(teamYellow, teamBlue)));
 	}
 
 
@@ -109,13 +111,16 @@ public static BerkeleyDb withCustomLocation(final Path customLocation)
 
 
 	/**
+	 * @param teamYellow name of yellow team
+	 * @param teamBlue   name of blue team
 	 * @return the default name for a new database
 	 */
-	public static String getDefaultName()
+	public static String getDefaultName(String teamYellow, String teamBlue)
 	{
 		SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
 		dt.setTimeZone(TimeZone.getDefault());
-		return dt.format(new Date());
+		return dt.format(new Date()) + String.format("_%s-vs-%s", teamYellow.replace(" ", "_"),
+				teamBlue.replace(" ", "_"));
 	}
 
 

modules/moduli-record/src/main/java/edu/tigers/sumatra/persistence/RecordManager.java

@@ -37,6 +37,8 @@ public class RecordManager extends AModule implements IRefereeObserver
 	private final List<IBerkeleyRecorderHook> hooks = new CopyOnWriteArrayList<>();
 	private long lastCommandCounter = -1;
 	private BerkeleyAsyncRecorder recorder = null;
+	private String teamYellow = "";
+	private String teamBlue = "";
 
 	@Configurable(defValue = "false", comment = "Automatically compress recordings after they were closed")
 	private static boolean compressOnClose = false;
@@ -55,7 +57,8 @@ protected Mutations getMutations()
 		Mutations mutations = new Mutations();
 		mutations.addRenamer(new Renamer("edu.tigers.sumatra.referee.gameevent.AttackerInDefenseArea", 0,
 				"edu.tigers.sumatra.referee.gameevent.AttackerTouchedBallInDefenseArea"));
-		mutations.addRenamer(new Renamer("edu.tigers.sumatra.ai.metis.offense.action.moves.OffensiveAction", 3, "edu.tigers.sumatra.ai.metis.offense.action.OffensiveAction"));
+		mutations.addRenamer(new Renamer("edu.tigers.sumatra.ai.metis.offense.action.moves.OffensiveAction", 3,
+				"edu.tigers.sumatra.ai.metis.offense.action.OffensiveAction"));
 
 		return mutations;
 	}
@@ -162,6 +165,11 @@ private boolean isNoGameStage(final SslGcRefereeMessage.Referee refMsg)
 	@Override
 	public void onNewRefereeMsg(final SslGcRefereeMessage.Referee refMsg)
 	{
+		if (refMsg != null && recorder == null)
+		{
+			teamYellow = refMsg.getYellow().getName();
+			teamBlue = refMsg.getBlue().getName();
+		}
 		if (autoRecord && SumatraModel.getInstance().isTournamentMode() && (refMsg != null)
 				&& refMsg.getCommandCounter() != lastCommandCounter)
 		{
@@ -243,13 +251,19 @@ public synchronized void toggleRecording()
 
 
 	protected void startRecording()
+	{
+		startRecording(teamYellow, teamBlue);
+	}
+
+
+	private void startRecording(String teamYellow, String teamBlue)
 	{
 		if (recorder != null)
 		{
 			log.warn("Start recording requested, but there is still an active recorder. Stopping it.");
 			recorder.stop();
 		}
-		recorder = new BerkeleyAsyncRecorder(newBerkeleyDb());
+		recorder = new BerkeleyAsyncRecorder(newBerkeleyDb(teamYellow, teamBlue));
 		recorder.getDb().getEnv().setCompressOnClose(compressOnClose);
 		onNewBerkeleyRecorder(recorder);
 		recorder.start();
@@ -290,11 +304,13 @@ public BerkeleyDb newBerkeleyDb(Path dbPath)
 	/**
 	 * Create a new berkeley database with default accessors attached
 	 *
+	 * @param teamYellow yellow team name
+	 * @param teamBlue   blue team name
 	 * @return a new empty database
 	 */
-	private BerkeleyDb newBerkeleyDb()
+	private BerkeleyDb newBerkeleyDb(String teamYellow, String teamBlue)
 	{
-		BerkeleyDb db = BerkeleyDb.withDefaultLocation();
+		BerkeleyDb db = BerkeleyDb.withDefaultLocation(teamYellow, teamBlue);
 		onNewBerkeleyDb(db);
 		return db;
 	}