Handle unique names and prefix in import loadouts

Signed-off-by: Tomas Slusny <[email protected]>

Author: deathbeam

src/Classes/ConfigTab.lua

@@ -611,7 +611,7 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
 	self.controls.scrollBar = new("ScrollBarControl", {"TOPRIGHT",self,"TOPRIGHT"}, {0, 0, 18, 0}, 50, "VERTICAL", true)
 end)
 
-function ConfigTabClass:Load(xml, fileName, appendConfigs, prefix)
+function ConfigTabClass:Load(xml, fileName, appendConfigs)
 	if not appendConfigs then
 		self.activeConfigSetId = 0
 		self.configSets = { }
@@ -669,12 +669,7 @@ function ConfigTabClass:Load(xml, fileName, appendConfigs, prefix)
 			end
 			setInputAndPlaceholder(node, 1)
 		else
-			local configSetId = tonumber(node.attrib.id)
-			local title = node.attrib.title or "Default"
-			if appendConfigs and prefix then
-				title = prefix .. title
-			end
-			local configSet = self:NewConfigSet(not appendConfigs and configSetId, title)
+			local configSet = self:NewConfigSet(not appendConfigs and tonumber(node.attrib.id) or nil, node.attrib.title or "Default")
 			t_insert(self.configSetOrderList, configSet.id)
 			for _, child in ipairs(node) do
 				setInputAndPlaceholder(child, configSet.id)

src/Classes/ImportTab.lua

@@ -318,12 +318,15 @@ You can get this from your web browser's cookies while logged into the Path of E
 			local controls = { }
 			t_insert(controls, new("LabelControl", nil, {0, 20, 0, 16}, colorCodes.WARNING.."Warning:^7 Importing many loadouts into the same build"))
 			t_insert(controls, new("LabelControl", nil, {0, 36, 0, 16}, "may cause performance issues. Use with caution."))
-			t_insert(controls, new("LabelControl", nil, {0, 64, 0, 16}, "^7Prefix for imported loadouts (optional):"))
-			controls.prefix = new("EditControl", nil, {0, 84, 350, 20}, "", nil, nil, 50)
+			t_insert(controls, new("LabelControl", nil, {0, 64, 0, 16}, "^7Prefix for imported loadouts:"))
+			controls.prefix = new("EditControl", nil, {0, 84, 350, 20}, "Imported - ", nil, nil, 50)
 			controls.import = new("ButtonControl", nil, {-45, 114, 80, 20}, "Import", function()
 				local prefix = controls.prefix.buf
+				if prefix == "" then
+					prefix = "Imported - "
+				end
 				main:ClosePopup()
-				self.build:ImportLoadouts(self.importCodeXML, prefix ~= "" and prefix or nil)
+				self.build:ImportLoadouts(self.importCodeXML, prefix)
 			end)
 			t_insert(controls, new("ButtonControl", nil, {45, 114, 80, 20}, "Cancel", function()
 				main:ClosePopup()

src/Classes/ItemsTab.lua

@@ -958,7 +958,7 @@ holding Shift will put it in the second.]])
 	self.lastSlot = self.slots[baseSlots[#baseSlots]]
 end)
 
-function ItemsTabClass:Load(xml, dbFileName, appendItems, prefix)
+function ItemsTabClass:Load(xml, dbFileName, appendItems)
 	if not appendItems then
 		self.activeItemSetId = 0
 		self.itemSets = { }
@@ -1037,11 +1037,7 @@ function ItemsTabClass:Load(xml, dbFileName, appendItems, prefix)
 			end
 		elseif node.elem == "ItemSet" then
 			local itemSet = self:NewItemSet(not appendItems and tonumber(node.attrib.id) or nil)
-			local title = node.attrib.title
-			if appendItems and prefix then
-				title = prefix .. (title or "")
-			end
-			itemSet.title = title
+			itemSet.title = node.attrib.title
 			itemSet.useSecondWeaponSet = node.attrib.useSecondWeaponSet == "true"
 			for _, child in ipairs(node) do
 				if child.elem == "Slot" then

src/Classes/PassiveSpec.lua

@@ -83,12 +83,8 @@ function PassiveSpecClass:Init(treeVersion, convert)
 	self.hashOverrides = { }
 end
 
-function PassiveSpecClass:Load(xml, dbFileName, prefix)
-	local title = xml.attrib.title
-	if prefix then
-		title = prefix .. (title or "")
-	end
-	self.title = title
+function PassiveSpecClass:Load(xml, dbFileName)
+	self.title = xml.attrib.title
 	local url
 	for _, node in pairs(xml) do
 		if type(node) == "table" then

src/Classes/SkillsTab.lua

@@ -374,7 +374,7 @@ function SkillsTabClass:LoadSkill(node, skillSetId)
 	t_insert(self.skillSets[skillSetId].socketGroupList, socketGroup)
 end
 
-function SkillsTabClass:Load(xml, fileName, appendSkills, prefix)
+function SkillsTabClass:Load(xml, fileName, appendSkills)
 	if not appendSkills then
 		self.activeSkillSetId = 0
 		self.skillSets = { }
@@ -416,11 +416,7 @@ function SkillsTabClass:Load(xml, fileName, appendSkills, prefix)
 
 		if node.elem == "SkillSet" then
 			local skillSet = self:NewSkillSet(not appendSkills and tonumber(node.attrib.id) or nil)
-			local title = node.attrib.title
-			if appendSkills and prefix then
-				title = prefix .. (title or "")
-			end
-			skillSet.title = title
+			skillSet.title = node.attrib.title
 			t_insert(self.skillSetOrderList, skillSet.id)
 			for _, subNode in ipairs(node) do
 				self:LoadSkill(subNode, skillSet.id)

src/Classes/TreeTab.lua

@@ -444,7 +444,7 @@ function TreeTabClass:GetSpecList()
 	return newSpecList
 end
 
-function TreeTabClass:Load(xml, dbFileName, appendSpecs, prefix, itemIdMap)
+function TreeTabClass:Load(xml, dbFileName, appendSpecs, itemIdMap)
 	if not appendSpecs then
 		self.specList = { }
 	end
@@ -482,7 +482,7 @@ function TreeTabClass:Load(xml, dbFileName, appendSpecs, prefix, itemIdMap)
 				end
 
 				local newSpec = new("PassiveSpec", self.build, node.attrib.treeVersion or defaultTreeVersion)
-				newSpec:Load(node, dbFileName, prefix)
+				newSpec:Load(node, dbFileName)
 				t_insert(self.specList, newSpec)
 			end
 		end

src/Modules/Build.lua

@@ -1888,6 +1888,45 @@ function buildMode:ImportLoadouts(xmlText, prefix)
 		return true
 	end
 
+	-- Ensure unique names for imported entries
+	local usedNames = {}
+	local function makeUniqueName(name)
+		local baseName = name
+		local suffix = 2
+		while usedNames[name] do
+			name = baseName .. " (" .. suffix .. ")"
+			suffix = suffix + 1
+		end
+		usedNames[name] = true
+		return name
+	end
+	local function markName(name)
+		usedNames[name or "Default"] = true
+	end
+
+	-- Collect existing names from current build
+	for _, itemSet in pairs(self.itemsTab.itemSets) do
+		markName(itemSet.title)
+	end
+	for _, skillSet in pairs(self.skillsTab.skillSets) do
+		markName(skillSet.title)
+	end
+	for _, spec in ipairs(self.treeTab.specList) do
+		markName(spec.title)
+	end
+	for _, configSet in pairs(self.configTab.configSets) do
+		markName(configSet.title)
+	end
+
+	-- Pre-process the XML to add prefix and ensure unique names
+	local function addPrefixAndMakeUnique(node)
+		local titleAttr = "title"
+		if node.attrib and node.attrib[titleAttr] then
+			local title = prefix .. (node.attrib[titleAttr] or "")
+			node.attrib[titleAttr] = makeUniqueName(title)
+		end
+	end
+
 	-- Extract relevant sections from imported XML
 	local itemsSection = nil
 	local skillsSection = nil
@@ -1904,27 +1943,31 @@ function buildMode:ImportLoadouts(xmlText, prefix)
 				itemsSection = node
 				for _, n in ipairs(itemsSection) do
 					if n.elem == "ItemSet" then
+						addPrefixAndMakeUnique(n)
 						itemSetCount = itemSetCount + 1
 					end
 				end
 			elseif node.elem == "Skills" then
 				skillsSection = node
 				for _, n in ipairs(skillsSection) do
 					if n.elem == "SkillSet" then
+						addPrefixAndMakeUnique(n)
 						skillSetCount = skillSetCount + 1
 					end
 				end
 			elseif node.elem == "Tree" then
 				treeSection = node
 				for _, n in ipairs(treeSection) do
 					if n.elem == "Spec" then
+						addPrefixAndMakeUnique(n)
 						treeSpecCount = treeSpecCount + 1
 					end
 				end
 			elseif node.elem == "Config" then
 				configSection = node
 				for _, n in ipairs(configSection) do
 					if n.elem == "ConfigSet" then
+						addPrefixAndMakeUnique(n)
 						configSetCount = configSetCount + 1
 					end
 				end
@@ -1939,17 +1982,17 @@ function buildMode:ImportLoadouts(xmlText, prefix)
 
 	local itemIdMap = { }
 	if itemsSection then
-		itemIdMap = self.itemsTab:Load(itemsSection, self.dbFileName, true, prefix) or { }
+		itemIdMap = self.itemsTab:Load(itemsSection, self.dbFileName, true) or { }
 	end
 	if skillsSection then
-		self.skillsTab:Load(skillsSection, self.dbFileName, true, prefix)
+		self.skillsTab:Load(skillsSection, self.dbFileName, true)
 	end
 	if treeSection then
-		self.treeTab:Load(treeSection, self.dbFileName, true, prefix, itemIdMap)
+		self.treeTab:Load(treeSection, self.dbFileName, true, nil, itemIdMap)
 		self.treeTab:PostLoad()
 	end
 	if configSection then
-		self.configTab:Load(configSection, self.dbFileName, true, prefix)
+		self.configTab:Load(configSection, self.dbFileName, true)
 	end
 
 	-- Mark build as modified