Fix module being a global variable and compare trade helpers into one file

Author: vaisest

src/Classes/CompareBuySimilar.lua

@@ -6,8 +6,7 @@
 local t_insert = table.insert
 local m_floor = math.floor
 local dkjson = require "dkjson"
-local tradeHelpers = LoadModule("Classes/CompareTradeHelpers")
-local tradeQueryHelpers = LoadModule("Classes/TradeQueryHelpers")
+local tradeHelpers = LoadModule("Classes/TradeHelpers")
 
 local M = {}
 
@@ -86,7 +85,7 @@ local function buildURL(item, slotName, controls, modEntries, defenceEntries, is
 		end
 	else
 		-- Category filter
-		local categoryStr, _ = tradeQueryHelpers.GetTradeCategory(slotName, item)
+		local categoryStr, _ = tradeHelpers.getTradeCategory(slotName, item)
 		if categoryStr then
 			queryFilters.type_filters = {
 				filters = {

src/Classes/CompareTab.lua

@@ -10,7 +10,7 @@ local m_max = math.max
 local m_floor = math.floor
 local s_format = string.format
 local dkjson = require "dkjson"
-local tradeHelpers = LoadModule("Classes/CompareTradeHelpers")
+local tradeHelpers = LoadModule("Classes/TradeHelpers")
 local buySimilar = LoadModule("Classes/CompareBuySimilar")
 local calcsHelpers = LoadModule("Classes/CompareCalcsHelpers")
 local buildListHelpers = LoadModule("Modules/BuildListHelpers")

src/Classes/CompareTradeHelpers.lua src/Classes/TradeHelpers.luasrc/Classes/CompareTradeHelpers.lua renamed to src/Classes/TradeHelpers.lua

@@ -159,6 +159,59 @@ function M.findTradeHash(item, modLine, modType, isDesecrated)
 	end
 end
 
+-- Map slot name + item type to (trade API category string, itemCategoryTags key).
+-- queryStr:      e.g. "armour.shield", "weapon.onemace"
+-- categoryLabel: e.g. "Shield", "1HMace", "1HWeapon" (nil for flask / generic jewel / unsupported)
+--- @param slotName string
+--- @param item table
+function M.getTradeCategory(slotName, item)
+	if not slotName then return nil, nil end
+	local itemType = item and (item.type or (item.base and item.base.type))
+	if slotName:find("^Weapon %d") then
+		if not itemType then return "weapon.one", "1HWeapon" end
+		if itemType == "Shield" then return "armour.shield", "Shield"
+		elseif itemType == "Focus" then return "armour.focus", "Focus"
+		elseif itemType == "Buckler" then return "armour.buckler", "Buckler"
+		elseif itemType == "Quiver" then return "armour.quiver", "Quiver"
+		elseif itemType == "Bow" then return "weapon.bow", "Bow"
+		elseif itemType == "Crossbow" then return "weapon.crossbow", "Crossbow"
+		elseif itemType == "Talisman" then return "weapon.talisman", "Talisman"
+		elseif itemType == "Staff" and item.base.subType == "Warstaff" then return "weapon.warstaff", "Quarterstaff"
+		elseif itemType == "Staff" then return "weapon.staff", "Staff"
+		elseif itemType == "Two Hand Sword" then return "weapon.twosword", "2HSword"
+		elseif itemType == "Two Hand Axe" then return "weapon.twoaxe", "2HAxe"
+		elseif itemType == "Two Hand Mace" then return "weapon.twomace", "2HMace"
+		elseif itemType == "Fishing Rod" then return "weapon.rod", "FishingRod"
+		elseif itemType == "One Hand Sword" then return "weapon.onesword", "1HSword"
+		elseif itemType == "Spear" then return "weapon.spear", "Spear"
+		elseif itemType == "Flail" then return "weapon.flail", "weapon.flail"
+		elseif itemType == "One Hand Axe" then return "weapon.oneaxe", "1HAxe"
+		elseif itemType == "One Hand Mace" then return "weapon.onemace", "1HMace"
+		elseif itemType == "Sceptre" then return "weapon.sceptre", "Sceptre"
+		elseif itemType == "Wand" then return "weapon.wand", "Wand"
+		elseif itemType == "Dagger" then return "weapon.dagger", "Dagger"
+		elseif itemType == "Claw" then return "weapon.claw", "Claw"
+		elseif itemType:find("Two Hand") then return "weapon.twomelee", "2HWeapon"
+		elseif itemType:find("One Hand") then return "weapon.one", "1HWeapon"
+		else
+			return nil, nil
+		end
+	elseif slotName == "Body Armour" then return "armour.chest", "Chest"
+	elseif slotName == "Helmet" then return "armour.helmet", "Helmet"
+	elseif slotName == "Gloves" then return "armour.gloves", "Gloves"
+	elseif slotName == "Boots" then return "armour.boots", "Boots"
+	elseif slotName == "Amulet" then return "accessory.amulet", "Amulet"
+	elseif slotName == "Ring 1" or slotName == "Ring 2" or slotName == "Ring 3" then return "accessory.ring", "Ring"
+	elseif slotName == "Belt" then return "accessory.belt", "Belt"
+	elseif slotName:find("Jewel") then return "jewel", "Jewel"
+	elseif slotName:find("Flask 1") then return "flask.life", "Life Flask"
+	elseif slotName:find("Flask 2") then return "flask.mana", "Mana Flask"
+	-- these don't have a unique string so overlapping mods of the same benefit could interfere. , "Charm"
+	elseif slotName:find("Charm") ~= nil then return "flask"
+	else return nil, nil
+	end
+end
+
 -- Helper: get a display-friendly category name from slot name
 function M.getTradeCategoryLabel(slotName, item)
 	if not item or not item.base then return "Item" end

src/Classes/TradeQueryGenerator.lua

@@ -9,7 +9,7 @@ local curl = require("lcurl.safe")
 local m_max = math.max
 local s_format = string.format
 local t_insert = table.insert
-local tradeHelpers = LoadModule("Classes/TradeQueryHelpers")
+local tradeHelpers = LoadModule("Classes/TradeHelpers")
 
 -- string are an any type while tables require all fields to be matched with type and subType require both to be matched exactly. [1] type, [2] subType, subType is optional and must be nil if not present.
 local tradeCategoryNames = {
@@ -690,7 +690,7 @@ function TradeQueryGeneratorClass:StartQuery(slot, options)
 			}
 		end
 	else
-		itemCategoryQueryStr, itemCategory = tradeHelpers.GetTradeCategory(slot.slotName, existingItem)
+		itemCategoryQueryStr, itemCategory = tradeHelpers.getTradeCategory(slot.slotName, existingItem)
 		if not itemCategory then
 			logToFile("'%s' is not supported for weighted trade query generation", existingItem and existingItem.type or "n/a")
 			return