Buy similar: fix matching mods with dropdown options, and fix inverted mod matching

Author: vaisest

src/Classes/CompareBuySimilar.lua

@@ -129,7 +129,7 @@ local function buildURL(item, slotName, controls, modEntries, defenceEntries, is
 		if entry.tradeId and controls[prefix .. "Check"] and controls[prefix .. "Check"].state then
 
 			local filter = { id = entry.tradeId }
-			if entry.valueIsOption then
+			if entry.options then
 				filter.value = { option = entry.value }
 			elseif entry.value then
 				local minVal = tonumber(controls[prefix .. "Min"].buf)
@@ -215,26 +215,9 @@ function M.openPopup(item, slotName, primaryBuild)
 						-- Use range-resolved text for matching
 						local resolvedLine = (modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar)) or modLine.line
 
-						-- special case: cluster enchantment
-						local identifier, value
-						-- whether to add a min and max, or an option field
-						local valueIsOption = false
-						local clusterMatch = resolvedLine:match("Added Small Passive Skills grant: (.+)") 
-						if clusterMatch then
-							identifier = "enchant.stat_3948993189"
-							for _, v in pairs(item.clusterJewel.skills) do
-								for _, stat in ipairs(v.stats) do
-									if stat == clusterMatch then
-										value = v.id
-										valueIsOption = true
-										goto outer
-									end
-								end
-							end
-							::outer::
-						else
-							local tradeHash = tradeHelpers.findTradeHash(item, resolvedLine, source.type)
-							identifier = tradeHash and string.format("%s.stat_%s", source.type, tradeHash)
+						local tradeHash, options, value = tradeHelpers.findTradeHash(item, resolvedLine, source.type)
+						local identifier = tradeHash and string.format("%s.stat_%s", source.type, tradeHash)
+						if not options then
 							value = tradeHelpers.modLineValue(resolvedLine)
 						end
 
@@ -244,7 +227,7 @@ function M.openPopup(item, slotName, primaryBuild)
 							formatted = formatted,
 							tradeId = identifier,
 							value = value,
-							valueIsOption = valueIsOption,
+							options = options,
 							modType = source.type,
 							type = source.type,
 							invert = tradeHelpers.shouldBeInverted(identifier, resolvedLine, source.type)
@@ -419,15 +402,15 @@ function M.openPopup(item, slotName, primaryBuild)
 			-- strip color codes and replace with gray
 			displayText = "^8" .. displayText:gsub("%^x%x%x%x%x%x%x", ""):gsub("%^%x", "")
 		end
-		if #displayText > (#colorCodeLength + 65) then
-			displayText = displayText:sub(1, #colorCodeLength + 55) .. "..."
+		if #displayText > (#colorCodeLength + 60) then
+			displayText = displayText:sub(1, #colorCodeLength + 54) .. "..."
 		end
 
 		controls[prefix .. "Label"] = new("LabelControl", { "LEFT", controls[prefix .. "Check"], "RIGHT" }, { 4, 0, 0, 16 },
 			displayText)
 		-- when the trade site has a dropdown for the value, we opt to disable
 		-- the inputs as they are numeric
-		if not entry.valueIsOption and entry.value then
+		if not entry.options and entry.value then
 			controls[prefix .. "Min"] = newPlainNumericEdit(nil, {minFieldX - popupWidth/2, ctrlY, fieldW, fieldH}, entry.value ~= 0 and tostring(m_floor(entry.value)) or "", "Min", 8)
 			controls[prefix .. "Max"] = newPlainNumericEdit(nil, {maxFieldX - popupWidth/2, ctrlY, fieldW, fieldH}, "", "Max", 8)
 			if not canSearch then
@@ -448,7 +431,6 @@ function M.openPopup(item, slotName, primaryBuild)
 	controls.search.enabled = function()
 		return uri and uri ~= ""
 	end
-	-- ctrlY = ctrlY + rowHeight + 4
 
 	controls.close = new("ButtonControl", nil, {popupWidth/2 - 50, ctrlY, 60, 20}, "Close", function()
 		main:ClosePopup()

src/Classes/TradeHelpers.lua

@@ -35,6 +35,8 @@ end
 -- Helper: fetch and cache the trade API stats
 local _tradeStats = nil
 local _tradeStatsFetched = false
+-- contains data for stats which have options, like allocates #
+local optionTradeStatMap = {}
 --- @return table
 local function getTradeStatsLookup()
 	if _tradeStats then return _tradeStats end
@@ -52,6 +54,21 @@ local function getTradeStatsLookup()
 	if not ok or tradeStats == "" then return {} end
 	local parsed = dkjson.decode(tradeStats)
 	_tradeStats = parsed.result
+
+	for _, cat in ipairs(_tradeStats) do
+		if cat.id == "enchant" or cat.id == "explicit" or cat.id == "implicit" then
+			for _, entry in ipairs(cat.entries) do
+				if entry.option and entry.text:match("#") then
+					-- pob parses the passage part as a separate mod line, which
+					-- causes trouble
+					local matchKey = entry.text:gsub("#", "(.*)"):gsub("\nPassage", "")
+					local hash = tonumber(entry.id:match("%a+.stat_(%d+)"))
+					optionTradeStatMap[matchKey] = { type = cat.id, options = entry.option.options, tradeHash = hash }
+				end
+			end
+		end
+	end
+
 	return _tradeStats
 end
 
@@ -96,6 +113,10 @@ end
 function M.shouldBeInverted(tradeId, modLine, modType)
 	local formattedLine = M.formatDatabaseText(M.formatDatabaseText(modLine))
 	local invertedLine, inverseKey = M.swapInverse(formattedLine)
+	invertedLine = invertedLine:gsub("^%-", "")
+	if not inverseKey then
+		return false
+	end
 	for _, category in ipairs(getTradeStatsLookup()) do
 		if category.id == modType then
 			for _, stat in ipairs(category.entries) do
@@ -140,8 +161,15 @@ end
 --- @param item table
 --- @param modLine string
 --- @param modType string
---- @return number?
+--- the hash that was found
+--- @return number? hash, table[]? optionsIfApplicable, number[]? matchedOptionId
 function M.findTradeHash(item, modLine, modType)
+	-- these mod results in false positives and are either useless, or
+	-- effectively found by searching for the unique item's name
+	if modLine == "Passage" or modLine ==  "Passive Skills in Radius can be Allocated without being connected to your tree" then
+		return nil
+	end
+
 	local formattedLine = M.formatDatabaseText(modLine)
 	-- the data export splits some mods into different parts, even though they
 	-- are technically just one stat. we handle that here
@@ -157,9 +185,6 @@ function M.findTradeHash(item, modLine, modType)
 		end
 		for tradeHash, description in pairs(dbMod.tradeHashes) do
 			local tradeLine = table.concat(description, "\n")
-			if tradeLine:match("increased Critical Strike Chance against Shocked Enemies") then
-				ConPrintf("help")
-			end
 			if formattedLine == M.formatDatabaseText(tradeLine) then
 				return tradeHash
 			end
@@ -172,11 +197,25 @@ function M.findTradeHash(item, modLine, modType)
 					return tradeHash
 				end
 			end
-			
-		
 		end
 	end
 
+	-- initialise optionTradeStatMap
+	if not _tradeStats then
+		getTradeStatsLookup()
+	end
+	-- reformat double-line cluster enchants
+	modLine = modLine:gsub("\nAdded Small Passive Skills grant: ", "\n")
+	for pat, entry in pairs(optionTradeStatMap) do
+		local match = modLine:match(pat)
+		if entry.type == modType and match then
+			for _, option in ipairs(entry.options) do
+				if option.text == match then
+					return entry.tradeHash, entry.options, option.id
+				end
+			end
+		end
+	end
 	if item.foulborn then
 		for _, dbMod in pairs(data.itemMods.Foulborn) do
 			local tradeHashMaybe = findStat(dbMod)