From cc4154d610adf7aee7816279171a50fe074aa675 Mon Sep 17 00:00:00 2001
From: NebelNidas
Date: Mon, 10 Oct 2022 13:25:02 +0200
Subject: Add progress listener to Mapping-IO conversion; deduplicate lang
 files

---
 .../src/main/java/cuchaz/enigma/gui/GuiController.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'enigma-swing/src/main/java')

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index 73472ca..5b04f3c 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -157,9 +157,18 @@ public class GuiController implements ClientPacketHandler {
 				EntryTree<EntryMapping> mappings;
 
 				if (useMappingIo) {
+					String loadingMessage;
+
+					if (format.getMappingIoCounterpart().hasSingleFile()) {
+						loadingMessage = I18n.translate("progress.mappings.loading_file");
+					} else {
+						loadingMessage = I18n.translate("progress.mappings.loading_directory");
+					}
+
+					progress.init(1, loadingMessage);
 					MemoryMappingTree mappingTree = new MemoryMappingTree();
 					MappingReader.read(path, format.getMappingIoCounterpart(), mappingTree);
-					mappings = MappingIoConverter.fromMappingIo(mappingTree);
+					mappings = MappingIoConverter.fromMappingIo(mappingTree, progress);
 				} else {
 					mappings = format.read(path, progress, saveParameters);
 				}
@@ -219,10 +228,13 @@ public class GuiController implements ClientPacketHandler {
 			loadedMappingPath = path;
 
 			if (useMappingIo) {
-				MemoryMappingTree mappingTree = MappingIoConverter.toMappingIo(mapper.getObfToDeobf());
+				MemoryMappingTree mappingTree = MappingIoConverter.toMappingIo(mapper.getObfToDeobf(), progress);
+
+				progress.init(1, I18n.translate("progress.mappings.writing"));
 				MappingWriter writer = MappingWriter.create(path, format.getMappingIoCounterpart());
 				mappingTree.accept(writer);
 				writer.close();
+				progress.step(1, I18n.translate("progress.done"));
 			} else if (saveAll) {
 				format.write(mapper.getObfToDeobf(), path, progress, saveParameters);
 			} else {
-- 
cgit v1.2.3