do not add same conversion again in recent conversions history

xtremexp · Jan 22, 2023 · 57cc266 · 57cc266
1 parent 72c5714
commit 57cc266
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/main/java/org/xtx/ut4converter/config/ApplicationConfig.java b/src/main/java/org/xtx/ut4converter/config/ApplicationConfig.java
@@ -227,9 +227,11 @@ public List<ConversionSettings> getRecentConversions() {
 
     public void addRecentConversion(final ConversionSettings conversionSettings) {
 
-        this.recentConversions.add(0, conversionSettings);
-        // limit history to 8
-        this.recentConversions = recentConversions.subList(0, Math.min(this.recentConversions.size(), 7));
+        if (!this.recentConversions.contains(conversionSettings)) {
+            this.recentConversions.add(0, conversionSettings);
+            // limit history to 8
+            this.recentConversions = recentConversions.subList(0, Math.min(this.recentConversions.size(), 8));
+        }
     }
 
     public int getVersion() {

diff --git a/src/test/java/org/xtx/ut4converter/config/model/ApplicationConfigTest.java b/src/test/java/org/xtx/ut4converter/config/model/ApplicationConfigTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.xtx.ut4converter.config.ApplicationConfig;
+import org.xtx.ut4converter.config.ConversionSettings;
 import org.xtx.ut4converter.config.GameConversionConfig;
 import org.xtx.ut4converter.ucore.UnrealGame;
 
@@ -89,4 +90,32 @@ void createOrUpdate() throws IOException {
         Assertions.assertTrue(u1Game.getSuggestedPath().getAbsolutePath().contains("C:\\Program Files (x86)\\Steam\\steamapps\\common\\Unreal Gold"));
     }
 
+    @Test
+    void testAddConversion() {
+        final ApplicationConfig appConfig = new ApplicationConfig();
+
+        final ConversionSettings cs = new ConversionSettings();
+        appConfig.addRecentConversion(cs);
+
+        Assertions.assertEquals(1, appConfig.getRecentConversions().size());
+
+        // same conversion added, should not add same conversion
+        appConfig.addRecentConversion(cs);
+        Assertions.assertEquals(1, appConfig.getRecentConversions().size());
+
+        final ConversionSettings cs2 = new ConversionSettings();
+        cs2.setInputMap(new File("c://mymap.unr"));
+        appConfig.addRecentConversion(cs2);
+        Assertions.assertEquals(2, appConfig.getRecentConversions().size());
+
+        for (int i = 0; i <= 10; i++) {
+            final ConversionSettings csx = new ConversionSettings();
+            csx.setInputMap(new File("c://mymap.unr" + i));
+            appConfig.addRecentConversion(csx);
+        }
+
+        // recent conversion history limited to 8
+        Assertions.assertEquals(8, appConfig.getRecentConversions().size());
+    }
+
 }