wow/ouroloot: core.lua comparison

comparison core.lua @ 89:939569ded66f

- Also include revision numbers when sending/displaying version data. - Do a tweaked variant of the "ensure useful unique tags" code in _addLootEntry. - When debugging comms, send to raid *and* guild instead of either. - Remove flaky optimization in fixup_unique_replacements. Thanks to Hyndron for helping me test this with genuine non-contrived data.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Thu, 28 Jun 2012 19:44:53 +0000
parents	c9f955f9a285
children	92e0db376858

comparison

equal deleted inserted replaced

-:c9f955f9a285
+:939569ded66f
 	['artifact'] = 6,
 	--['heirloom'] = 7,
 }
 local my_name				= UnitName('player')
 local comm_cleanup_ttl		= 4   -- seconds in the communications cache
-local revision_large		= nil -- defaults to 1, possibly changed by revision
+local version_large			= nil -- defaults to 1, possibly changed by version
 local g_LOOT_ITEM_ss, g_LOOT_ITEM_MULTIPLE_sss, g_LOOT_ITEM_SELF_s, g_LOOT_ITEM_SELF_MULTIPLE_ss
 ------ Addon member data
 local flib = LibStub("LibFarmbuyer")
 -- Play cute games with namespaces here just to save typing.  WTB Lua 5.2 PST.
 do local _G = _G setfenv (1, addon)
 	commrev			= '17'
-	revision		= _G.GetAddOnMetadata(nametag,"Version") or "?"  -- "x.yy.z", etc
+	version			= _G.GetAddOnMetadata(nametag,"Version") or "?"  -- "x.yy.z", etc
 	ident			= "OuroLoot2"
 	identTg			= "OuroLoot2Tg"
 	status_text		= nil
+	revision		= "@project-revision@"
+	--@debug@
+	revision		= "DEVEL"
+	--@end-debug@
 	tekdebug		= nil
 	if _G.tekDebug then
 		local tdframe = _G.tekDebug:GetFrame("Ouro Loot")
 		function tekdebug (txt)
 -- Try to extract numbers from the .toc "Version" and munge them into an
 -- integral form for comparison.  The result doesn't need to be meaningful as
 -- long as we can reliably feed two of them to "<" and get useful answers.
 --
--- This makes/reinforces an assumption that revision_large of release packages
+-- This makes/reinforces an assumption that version_large of release packages
 -- (e.g., 2016001) will always be higher than those of development packages
 -- (e.g., 87), due to the tagging system versus subversion file revs.  This
 -- is good, as local dev code will never trigger a false positive update
 -- warning for other users.
 do
 	local r = 0
-	for d in addon.revision:gmatch("%d+") do
+	for d in addon.version:gmatch("%d+") do
 		r = 1000*r + d
 	end
 	-- If it's a big enough number to obviously be a release, then make
 	-- sure it's big enough to overcome many small previous point releases.
 	while r > 2000 and r < 2000000 do
 		r = 1000*r
 	end
-	revision_large = math.max(r,1)
+	version_large = math.max(r,1)
 end
 -- Hypertext support, inspired by DBM broadcast pizza timers
 do
 	local hypertext_format_str = "|HOuroLoot:%d|h%s[%s]|r|h"
 		end
 		if dirty then self:Print("Saved data has been massaged into shape.") end
 	end
 	_init(self)
-	self.dprint('flow', "version strings:", revision_large, self.status_text)
+	self.dprint('flow', "version strings:", version_large, self.revision, self.status_text)
 	self.load_assert = nil
 	self.OnInitialize = nil   -- free up ALL the things!
 end
 function addon:OnEnable()
 	-- Fires before the plugin's own OnEnable (inherited or otherwise).
 	--function addon:OnModuleCreated (plugin)
 	--	print("created plugin", plugin:GetName())
 	--end
-	local olrev = tonumber("@project-revision@") or 0
 	local err = [[Module '%s' cannot register itself because it failed a required condition: '%s']]
 	function addon:ConstrainedNewModule (modname, minrev, mincomm, mindata)
 		if not addon.author_debug then
-			if minrev and minrev > olrev then
+			if minrev and tonumber(minrev) > (tonumber(self.revision) or math.huge) then
 				self:Print(err,modname,
-					"revision "..olrev.." older than minimum "..minrev)
+					"revision "..self.revision.." older than minimum "..minrev)
 				return false
 			end
-			if mincomm and mincomm > tonumber(self.commrev) then
+			if mincomm and tonumber(mincomm) > tonumber(self.commrev) then
 				self:Print(err,modname,
 					"commrev "..self.commrev.." older than minimum "..mincomm)
 				return false
 			end
-			if mindata and mindata > opts.datarev then
+			if mindata and tonumber(mindata) > opts.datarev then
 				self:Print(err,modname,
 					"datarev "..opts.datarev.." older than minimum "..mindata)
 				return false
 			end
 		end
 				if not itemstring then
 					itemstring = msg:match(g_LOOT_ITEM_SELF_s)
 				end
 			end
+			if not itemstring then return end    -- "PlayerX selected Greed", etc, not looting
 			self.dprint('loot', "CHAT_MSG_LOOT, person is", person,
 				", itemstring is", itemstring, ", count is", count)
-			if not itemstring then return end    -- "PlayerX selected Greed", etc, not looting
 			-- Name might be colorized, remove the highlighting
 			if person then
 				person = person:match("|c%x%x%x%x%x%x%x%x(%S+)") or person
 			else
 		self:SetThreshold (opt_threshold, --[[quiet_p=]]true)
 	end
 	self:Print("Now %s; threshold currently %s.",
 		self.enabled and "tracking" or "only broadcasting",
 		self.thresholds[self.threshold])
-	self:broadcast('revcheck',revision_large)
+	self:broadcast('revcheck',version_large)
 end
 -- Note:  running '/loot off' will also avoid the popup reminder when
 -- joining a raid, but will not change the saved option setting.
 function addon:Deactivate()
 		local e = g_loot[index]
 		if not e then
 			-- how did this happen?
 			return
 		end
+		if source == my_name then
+			source = _G.UNIT_YOU
+		end
 		local from_text, to_text
 		if from_whom then
+			if from_whom == my_name then
+				from_whom = _G.UNIT_YOU
+			end
 			from_text = addon:colorize (from_whom, from_class)
-			to_text = addon:colorize (e.person, e.person_class)
+			to_text = e.person == my_name and _G.UNIT_YOU or e.person
+			to_text = addon:colorize (to_text, e.person_class)
 		else
 			if olddisp then
 				from_text = addon.disposition_colors[olddisp].text
 			else
 				olddisp = "normal"
 function addon:DoPing()
 	self:Print("Give me a ping, Vasili. One ping only, please.")
 	self.sender_list.active = {}
 	self.sender_list.names = {}
 	self:broadcast('ping')
-	self:broadcast('revcheck',revision_large)
+	self:broadcast('revcheck',version_large)
 end
-function addon:_check_revision (otherrev)
+function addon:_check_version (otherrev)
 	self.dprint('comm', "revchecking against", otherrev)
 	otherrev = tonumber(otherrev)
-	if otherrev == revision_large then
+	if otherrev == version_large then
 		-- normal case
-	elseif otherrev < revision_large then
+	elseif otherrev < version_large then
 		self.dprint('comm', "ours is newer, notifying")
-		self:broadcast('revcheck',revision_large)
+		self:broadcast('revcheck',version_large)
 	else
 		self.dprint('comm', "ours is older, (possibly) yammering")
 		if newer_warning then
 			local pop = addon.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON,
 	end
 	if possible_st then
 		possible_st:SetData(g_loot)
 	end
-	self.status_text = ("%s communicating as ident %s commrev %s"):
+	self.status_text = ("%s(r%s) communicating as ident %s commrev %s"):
-		format (self.revision, self.ident, self.commrev)
+		format (self.version, self.revision, self.ident, self.commrev)
 	self:RegisterComm(self.ident)
 	self:RegisterComm(self.identTg, "OnCommReceivedNocache")
 	if self.author_debug then
 		_G.Oloot = g_loot
 		end
 		addon:_fill_out_eoi_data(1)
 	end
 	-- Adding anything original to g_loot goes through this routine.
+	-- More precisely, anything new on the EOI tab hits this; it does not
+	-- necessarily need to be a looted item.
 	function addon._addLootEntry (e)
 		setmetatable(e,loot_entry_mt)
 		if not done_todays_date then do_todays_date() end
 		--local localuptime = math.floor(GetTime())
 		local time_t = _G.time()
 		e.hour = h
 		e.minute = m
 		e.stamp = time_t --localuptime
+		if e.kind == 'loot' then
+			if (not e.unique) or (#e.unique==0) then
+				e.unique = e.id .. (e.disposition or e.person) .. _G.date("%Y/%m/%d %H:%M",e.stamp)
+			end
+		end
 		local index = #g_loot + 1
 		g_loot[index] = e
 		return index
 	end
 					winning_index = i
 				end
 				info[i] = nil
 			end
 			pprint('improv', "final:", winner[1], winner[2])
-			--@debug@
-			-- purely a sanity check
-			if winning_index == 1 then
-				if winner[2] ~= info.LOCAL then
-					pprint('improv',
-						"things locally generated are not locally generated?",
-						info.LOCAL, winner[2])
-				end
-			end
-			--@end-debug@
 			--[[
 			A:  winner was generated locally
 			   >winning_index == 1
 			   >g_loot and history already has the replacement value
 			B:  winner was generated remotely
 			   >need to scan and replace
 			Detecting A is strictly an optimization.  We should be able to do
-			this code safely in all cases.
+			this code safely in all cases.  Important to note:  a local winner
+			will always be at index 1, but a winner at index 1 does not necessarily
+			mean it was locally generated (e.g., if the local itemfilter drops
+			it but a remote player does an improv).  Just do the general case
+			until/unless this becomes a problem.
 			]]
-			if
+--XXX this branch still needs to be tested with live data
---@debug@
+			local cache = g_uniques:SEARCH(exist)
-true or
+			local looti,hi,ui = cache.loot, cache.history, cache.history_may
---@end-debug@
-				winning_index ~= 1 then
+			-- Active loot
-				--XXX this branch still needs to be tested with live data
+			if looti and g_loot[looti].unique == exist then
-				local cache = g_uniques:SEARCH(exist)
+				pprint('improv', "found and replaced loot entry", looti)
-				local looti,hi,ui = cache.loot, cache.history, cache.history_may
+				g_loot[looti].unique = winner[2]
+			else
-				-- Active loot
+				-- If sharded, filtered, or the improv was done by the local
-				if looti and g_loot[looti].unique == exist then
+				-- player, then the "previous" unique would not have made it
-					pprint('improv', "found and replaced loot entry", looti)
+				-- into the tables to begin with.  So don't flag an error.
-					g_loot[looti].unique = winner[2]
+				pprint('improv', "No active loot found", looti,
+					looti and g_loot[looti].unique, winning_index)
+			end
+			-- History
+			if hi ~= g_uniques.NOTFOUND then
+				hi = addon.history.byname[hi]
+				local hist = addon.history[hi]
+				if ui and hist.unique[ui] == exist then
+					-- ui is valid
 				else
-					-- If winning_index == 1, the "previous" unique would not
+					ui = nil
-					-- have made it into the tables to begin with.  So don't
+					for i,ui2 in ipairs(hist.unique) do
-					-- flag an error.  Still should be looked at.
+						if ui2 == exist then
-					pprint('improv', "Um.", looti, g_loot[looti].unique, winning_index)
+							ui = i
-				end
+							break
-				-- History
-				if hi ~= g_uniques.NOTFOUND then
-					hi = addon.history.byname[hi]
-					local hist = addon.history[hi]
-					if ui and hist.unique[ui] == exist then
-						-- ui is valid
-					else
-						ui = nil
-						for i,ui2 in ipairs(hist.unique) do
-							if ui2 == exist then
-								ui = i
-								break
-							end
 						end
 					end
-					if ui then
+				end
-						pprint('improv', "found and replacing history entry", hi,
+				if ui then
-							ui, hist.name)
+					pprint('improv', "found and replacing history entry", hi,
-						assert(exist ~= winner[2])
+						ui, hist.name)
-						hist.when[winner[2]] = hist.when[exist]
+					assert(exist ~= winner[2])
-						hist.id[winner[2]] = hist.id[exist]
+					hist.when[winner[2]] = hist.when[exist]
-						hist.count[winner[2]] = hist.count[exist]
+					hist.id[winner[2]] = hist.id[exist]
-						hist.unique[ui] = winner[2]
+					hist.count[winner[2]] = hist.count[exist]
-						hist.when[exist] = nil
+					hist.unique[ui] = winner[2]
-						hist.id[exist] = nil
+					hist.when[exist] = nil
-						hist.count[exist] = nil
+					hist.id[exist] = nil
-					end
+					hist.count[exist] = nil
 				end
 			end
 			pprint('improv', "finished with", exist, "into", winner[2])
 			flib.del(winner)
 			flib.del(info)
 			gur.replacements[exist] = nil
 		end
 					pprint(hmmm)  -- more?
 					-- try to simply fix up errors as we go
 					g_uniques[e.unique] = { loot = i, history = g_uniques.NOTFOUND }
 				end
 			else
+				-- The usual cause: when only source is from an older client
+				-- and the disposition did not trigger addhistory, then not
+				-- even a stub history entry happens.  Code has now been added
+				-- to try harder to prevent this, but it's still best to not
+				-- simple ignore it.
 				trouble = true
-				pprint('loot', "ERROR precache loop found bad unique tag!",
+				pprint('loot', "ERROR precache loop found missing/outdated unique tag!",
-					i, "tag", tostring(e.unique), "from?", tostring(e.bcast_from))
+					i, "tag <"..tostring(e.unique).."> from?", tostring(e.bcast_from))
 			end
 		end
 		UpdateAddOnMemoryUsage()
 		local after = GetAddOnMemoryUsage(nametag)
 		self:Print("Pre-scanning history for faster loot handling on %s used %.2f MB of memory across %d entries.",
 			self.history.realm, (after-before)/1024, count)
 		if trouble then
 			self:Print("Note that there were inconsistencies in the data;",
 				"you should consider submitting a bug report (including your",
 				"SavedVariables file), and regenerating or preening this",
-				"realm's loot history.")
+				"realm's loot history.  If you keep seeing this message, type",
+				"'/ouroloot fix ?' and try some of those actions.")
 		end
 		g_uniques:SETMODE('probe')
 		self._cache_history_uniques = nil
 	end
 	local function assemble(t,...)
 		local n = select('#',...)
 		if n > 0 then
 			local msg = {t,...}
 			-- tconcat requires strings, but T is known to be one already
-			-- can't use #msg since there might be holes
+			-- can't use #msg since there might be nil holes
 			for i = 2, n+1 do
 				msg[i] = tostring(msg[i] or "")
 			end
 			return tconcat (msg, '\a')
 		end
 		return self:broadcast(self.commrev..tag,...)
 	end
 	function addon:broadcast(tag,...)
 		local msg = assemble(tag,...)
 		self.dprint('comm', "<broadcast>:", msg)
-		-- the "GUILD" here is just so that we can also pick up on it
+		self:SendCommMessage(self.ident, msg, "RAID")
-		self:SendCommMessage(self.ident, msg, self.debug.comm and "GUILD" or "RAID")
+		-- this is what lets us debug our own message traffic:
+		if self.debug.comm then
+			self:SendCommMessage(self.ident, msg, "GUILD")
+		end
 	end
 	-- whispercast(<to>, 'tag', <stuff>)
 	function addon:whispercast(to,...)
 		local msg = assemble(...)
 		self.dprint('comm', "<whispercast>@", to, ":", msg)
 	-- player is not tracking loot, so test for that when appropriate.
 	local OCR_funcs = {}
 	OCR_funcs.ping = function (sender)
 		pprint('comm', "incoming ping from", sender)
-		addon:whispercast (sender, 'pong', addon.revision,
+		local what = addon.enabled and "tracking" or
-			addon.enabled and "tracking" or (addon.rebroadcast and "broadcasting" or "disabled"))
+			(addon.rebroadcast and "broadcasting" or "disabled")
-	end
+		addon:whispercast (sender, 'pong', addon.version, what, addon.revision)
-	OCR_funcs.pong = function (sender, _, rev, status)
+	end
-		local s = ("|cff00ff00%s|r %s is |cff00ffff%s|r"):format(sender,rev,status)
+	OCR_funcs.pong = function (sender, _, ver, status, opt_rev)
+		local s = ("|cff00ff00%s|r %s(r%s) is |cff00ffff%s|r"):
+			format (sender, ver, opt_rev or "?", status)
 		addon:Print("Echo: ", s)
 		adduser (sender, s, status=="tracking" or status=="broadcasting" or nil)
 	end
 	OCR_funcs.revcheck = function (sender, _, revlarge)
 		addon.dprint('comm', "revcheck, sender", sender)
-		addon:_check_revision (revlarge)
+		addon:_check_version (revlarge)
 	end
 	OCR_funcs['17improv'] = function (sender, _, senderid, existing, replace)
 		addon.dprint('comm', "DOTimprov/17, sender", sender, "id", senderid,
 			"existing", existing, "replace", replace)
 			local n = select('#',...)
 			for i = 1, n do
 				local d = select(i,...)
 				OCR_data[i] = (d ~= "") and d or nil
 			end
-			addon.dprint('comm', ":... processing", tag, "from", sender, "with arg count", n)
+			addon.dprint('comm', ":...processing", tag, "from", sender, "with arg count", n)
 			return f(sender,tag,unpack(OCR_data,1,n))
 		end
 		addon.dprint('comm', "unknown comm message", tag, "from", sender)
 	end
 	-- Recent message cache (this can be accessed via advanced options panel)

Mercurial > wow > ouroloot

comparison core.lua @ 89:939569ded66f