wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 464:6e78d7849ea3

Rewrote TradeSkill handling for new Legion APIs.

author	Caleb Atherton <catherton@curse.com>
date	Sat, 07 May 2016 21:07:38 -0400
parents	1136b1bc88a1
children	efdbef365ec0

comparison

equal deleted inserted replaced

-:1136b1bc88a1
+:6e78d7849ea3
 function TradeSkillExecutePer(iter_func)
 if not _G.TradeSkillFrame or not _G.TradeSkillFrame:IsVisible() then
 return
 end
--- Clear the search box focus so the scan will have correct results.
-local search_box = _G.TradeSkillFrameSearchBox
+		if (private.isLegion) then
-search_box:SetText("")
+			local recipes = _G.C_TradeSkillUI.GetAllRecipeIDs()
-_G.TradeSkillSearch_OnTextChanged(search_box)
+			if recipes and (#recipes > 0) then
-search_box:ClearFocus()
+				for i = 1, #recipes do
-search_box:GetScript("OnEditFocusLost")(search_box)
+					if iter_func(_G.C_TradeSkillUI.GetRecipeInfo(recipes[i]).name, recipes[i]) then
+						break
-table.wipe(header_list)
+					end
+				end
--- Save the current state of the TradeSkillFrame so it can be restored after we muck with it.
+			end
-local have_materials = _G.TradeSkillFrame.filterTbl.hasMaterials
+		else
-local have_skillup = _G.TradeSkillFrame.filterTbl.hasSkillUp
+			-- Clear the search box focus so the scan will have correct results.
+			local search_box = _G.TradeSkillFrameSearchBox
-if have_materials then
+			search_box:SetText("")
-_G.TradeSkillFrame.filterTbl.hasMaterials = false
-_G.TradeSkillOnlyShowMakeable(false)
+			_G.TradeSkillSearch_OnTextChanged(search_box)
-end
+			search_box:ClearFocus()
+			search_box:GetScript("OnEditFocusLost")(search_box)
-if have_skillup then
-_G.TradeSkillFrame.filterTbl.hasSkillUp = false
+			table.wipe(header_list)
-_G.TradeSkillOnlyShowSkillUps(false)
-end
+			-- Save the current state of the TradeSkillFrame so it can be restored after we muck with it.
-_G.SetTradeSkillInvSlotFilter(0, true, true)
+			local have_materials = _G.TradeSkillFrame.filterTbl.hasMaterials
-_G.TradeSkillUpdateFilterBar()
+			local have_skillup = _G.TradeSkillFrame.filterTbl.hasSkillUp
-_G.TradeSkillFrame_Update()
+			if have_materials then
--- Expand all headers so we can see all the recipes there are
+				_G.TradeSkillFrame.filterTbl.hasMaterials = false
-for tradeskill_index = 1, _G.GetNumTradeSkills() do
+				_G.TradeSkillOnlyShowMakeable(false)
-local name, tradeskill_type, _, is_expanded = _G.GetTradeSkillInfo(tradeskill_index)
+			end
-if tradeskill_type == "header" or tradeskill_type == "subheader" then
+			if have_skillup then
-if not is_expanded then
+				_G.TradeSkillFrame.filterTbl.hasSkillUp = false
-header_list[name] = true
+				_G.TradeSkillOnlyShowSkillUps(false)
-_G.ExpandTradeSkillSubClass(tradeskill_index)
+			end
-end
+			_G.SetTradeSkillInvSlotFilter(0, true, true)
-elseif iter_func(name, tradeskill_index) then
+			_G.TradeSkillUpdateFilterBar()
-break
+			_G.TradeSkillFrame_Update()
-end
-end
+			-- Expand all headers so we can see all the recipes there are
+			for tradeskill_index = 1, _G.GetNumTradeSkills() do
--- Restore the state of the things we changed.
+				local name, tradeskill_type, _, is_expanded = _G.GetTradeSkillInfo(tradeskill_index)
-for tradeskill_index = 1, _G.GetNumTradeSkills() do
-local name, tradeskill_type, _, is_expanded = _G.GetTradeSkillInfo(tradeskill_index)
+				if tradeskill_type == "header" or tradeskill_type == "subheader" then
+					if not is_expanded then
-if header_list[name] then
+						header_list[name] = true
-_G.CollapseTradeSkillSubClass(tradeskill_index)
+						_G.ExpandTradeSkillSubClass(tradeskill_index)
-end
+					end
-end
+				elseif iter_func(name, tradeskill_index) then
-_G.TradeSkillFrame.filterTbl.hasMaterials = have_materials
+					break
-_G.TradeSkillOnlyShowMakeable(have_materials)
+				end
-_G.TradeSkillFrame.filterTbl.hasSkillUp = have_skillup
+			end
-_G.TradeSkillOnlyShowSkillUps(have_skillup)
+			-- Restore the state of the things we changed.
-_G.TradeSkillUpdateFilterBar()
+			for tradeskill_index = 1, _G.GetNumTradeSkills() do
-_G.TradeSkillFrame_Update()
+				local name, tradeskill_type, _, is_expanded = _G.GetTradeSkillInfo(tradeskill_index)
+				if header_list[name] then
+					_G.CollapseTradeSkillSubClass(tradeskill_index)
+				end
+			end
+			_G.TradeSkillFrame.filterTbl.hasMaterials = have_materials
+			_G.TradeSkillOnlyShowMakeable(have_materials)
+			_G.TradeSkillFrame.filterTbl.hasSkillUp = have_skillup
+			_G.TradeSkillOnlyShowSkillUps(have_skillup)
+			_G.TradeSkillUpdateFilterBar()
+			_G.TradeSkillFrame_Update()
+		end
 end
 end -- do-block
 local ActualCopperCost
 local RECIPE_MATCH = _G.ERR_LEARN_RECIPE_S:gsub("%%s", "(.*)")
 local function RecordDiscovery(tradeskill_name, tradeskill_index)
 if tradeskill_name == private.discovered_recipe_name then
-DBEntry("spells", tonumber(_G.GetTradeSkillRecipeLink(tradeskill_index):match("^|c%x%x%x%x%x%x%x%x|H%w+:(%d+)"))).discovery = ("%d:%d"):format(private.previous_spell_id, private.profession_level)
+			if (private.isLegion) then
+				DBEntry("spells", tonumber(_G.C_TradeSkillUI.GetRecipeLink(tradeskill_index):match("^|c%x%x%x%x%x%x%x%x|H%w+:(%d+)"))).discovery = ("%d:%d"):format(private.previous_spell_id, private.profession_level)
+			else
+				DBEntry("spells", tonumber(_G.GetTradeSkillRecipeLink(tradeskill_index):match("^|c%x%x%x%x%x%x%x%x|H%w+:(%d+)"))).discovery = ("%d:%d"):format(private.previous_spell_id, private.profession_level)
+			end
 private.discovered_recipe_name = nil
 private.profession_level = nil
 private.previous_spell_id = nil
 if not item_id then
 if not private.trainer_shown then
 local recipe_name = message:match(RECIPE_MATCH)
 if recipe_name and private.previous_spell_id then
-local profession_name, prof_level = _G.GetTradeSkillLine()
+local profession_name, prof_level
+if private.isLegion then
+profession_name, prof_level= _G.C_TradeSkillUI.GetTradeSkillLine()
+else
+profession_name, prof_level= _G.GetTradeSkillLine()
+end
 if profession_name == _G.UNKNOWN then
 return
 end
 private.discovered_recipe_name = recipe_name
 for loot_slot = 1, _G.GetNumLootItems() do
 local texturefiledataID, item_text, slot_quantity, quality, locked = _G.GetLootSlotInfo(loot_slot)
 local slot_type = _G.GetLootSlotType(loot_slot)
 local loot_info = { _G.GetLootSourceInfo(loot_slot) }
-			local loot_link = _G.GetLootSlotLink(loot_slot)
+local loot_link = _G.GetLootSlotLink(loot_slot)
 -- Odd index is GUID, even is count.
 for loot_index = 1, #loot_info, 2 do
 local source_guid = loot_info[loot_index]
 end
 local source_type, source_id = ParseGUID(source_guid)
 local source_key = ("%s:%d"):format(source_type, source_id)
 if slot_type == LOOT_SLOT_ITEM then
-							if loot_link then
+if loot_link then
-								local item_id = ItemLinkToID(loot_link)
+local item_id = ItemLinkToID(loot_link)
-								Debug("GUID: %s - Type:ID: %s - ItemID: %d - Amount: %d (%d)", loot_info[loot_index], source_key, item_id, loot_info[loot_index + 1], slot_quantity)
+Debug("GUID: %s - Type:ID: %s - ItemID: %d - Amount: %d (%d)", loot_info[loot_index], source_key, item_id, loot_info[loot_index + 1], slot_quantity)
-								current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
+current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
-								current_loot.sources[source_guid][item_id] = (current_loot.sources[source_guid][item_id] or 0) + loot_quantity
+current_loot.sources[source_guid][item_id] = (current_loot.sources[source_guid][item_id] or 0) + loot_quantity
-								guids_used[source_guid] = true
+guids_used[source_guid] = true
 else
 Debug("%s: Loot link is nil for loot slot %d of the entity with GUID %s and Type:ID: %s.", event_name, loot_slot, loot_info[loot_index], source_key)
 end
 elseif slot_type == LOOT_SLOT_MONEY then
 Debug("GUID: %s - Type:ID: %s - Money - Amount: %d (%d)", loot_info[loot_index], source_key, loot_info[loot_index + 1], slot_quantity)
 guids_used[source_guid] = true
 end
 elseif slot_type == LOOT_SLOT_CURRENCY then
 -- Same bug with GetLootSlotInfo() will screw up currency when it happens, so we won't process this slot's loot.
 if loot_link then
-								local icon_texture = CurrencyLinkToTexture(loot_link)
+local icon_texture = CurrencyLinkToTexture(loot_link)
 Debug("GUID: %s - Type:ID: %s - Currency: %s - Amount: %d (%d)", loot_info[loot_index], source_key, icon_texture, loot_info[loot_index + 1], slot_quantity)
 if current_loot.target_type == AF.ZONE then
 table.insert(current_loot.list, ("currency:%d:%s"):format(loot_quantity, icon_texture))
 else
 local currency_token = ("currency:%s"):format(icon_texture)
 Forge = forge_spell_ids,
 }
 local function RegisterTools(tradeskill_name, tradeskill_index)
-local link = _G.GetTradeSkillRecipeLink(tradeskill_index)
+local link
+if (private.isLegion) then
+link = _G.C_TradeSkillUI.GetRecipeLink(tradeskill_index)
+else
+link = _G.GetTradeSkillRecipeLink(tradeskill_index)
+end
 if link then
 local spell_id = tonumber(link:match("^|c%x%x%x%x%x%x%x%x|H%w+:(%d+)"))
-local required_tool = _G.GetTradeSkillTools(tradeskill_index)
+local required_tool
+if (private.isLegion) then
+required_tool = _G.C_TradeSkillUI.GetRecipeTools(tradeskill_index)
+else
+required_tool = _G.GetTradeSkillTools(tradeskill_index)
+end
 if required_tool then
 for tool_name, registry in pairs(TRADESKILL_TOOLS) do
 if required_tool:find(tool_name) then
 registry[spell_id] = true
 end
 end
 function WDP:TRADE_SKILL_SHOW(event_name)
-local profession_name, prof_level = _G.GetTradeSkillLine()
+local profession_name, prof_level
+if private.isLegion then
+profession_name, prof_level= _G.C_TradeSkillUI.GetTradeSkillLine()
+else
+profession_name, prof_level= _G.GetTradeSkillLine()
+end
 if profession_name == _G.UNKNOWN then
 return
 end
 TradeSkillExecutePer(RegisterTools)

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 464:6e78d7849ea3