wow/ouroloot: core.lua comparison

comparison core.lua @ 6:df3e27edbd60

Much work on history tab.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Wed, 15 Jun 2011 03:59:13 +0000
parents	7adbc59de8fe
children	30ba1f35e164

comparison

equal deleted inserted replaced

-:7adbc59de8fe
+:df3e27edbd60
 user-facing code, ones with lowercase names are "one step removed", and
 names with leading underscores are strictly internal helper functions.
 ------ Saved variables
 ------ Constants
 ------ Addon member data
------- Locals
+------ Globals
 ------ Expiring caches
 ------ Ace3 framework stuff
 ------ Event handlers
 ------ Slash command handler
 ------ On/off
 ------ Addon member data
 local flib = LibStub("LibFarmbuyer")
 addon.author_debug = flib.author_debug
--- Play cute games with namespaces here just to save typing.
+-- Play cute games with namespaces here just to save typing.  WTB Lua 5.2 PST.
 do local _G = _G setfenv (1, addon)
 	revision		= 15
 	ident			= "OuroLoot2"
 	identTg			= "OuroLoot2Tg"
 addon = LibStub("AceAddon-3.0"):NewAddon(addon, "Ouro Loot",
 "AceTimer-3.0", "AceComm-3.0", "AceConsole-3.0", "AceEvent-3.0")
------- Locals
+------ Globals
 local g_loot			= nil
 local g_restore_p		= nil
 local g_saved_tmp		= nil   -- restoring across a clear
 local g_wafer_thin		= nil   -- for prompting for additional rebroadcasters
 local g_today			= nil   -- "today" entry in g_loot
 		if opts[opt] == nil then
 			opts[opt] = default
 		end
 	end
 	option_defaults = nil
-	-- transition/remove old options
+	-- transition&remove old options
 	opts["forum_use_itemid"] = nil
 	if opts["forum_format"] then
 		opts.forum["Custom..."] = opts["forum_format"]
 		opts["forum_format"] = nil
 	end
 	self.history_all = self.history_all or OuroLootSV_hist or {}
 	local r = assert(GetRealmName())
 	self.history_all[r] = self:_prep_new_history_category (self.history_all[r], r)
 	self.history = self.history_all[r]
-	OuroLootSV_hist = nil
+	--OuroLootSV_hist = nil
 	_init(self)
 	self.OnInitialize = nil
 end
 function addon:OnEnable()
+	--if not OuroLootSV_hist.PLAYER_LOGOUT then print"did not safely logout?" end; OuroLootSV_hist.PLAYER_LOGOUT = nil
 	self:RegisterEvent "PLAYER_LOGOUT"
 	self:RegisterEvent "RAID_ROSTER_UPDATE"
 	-- Cribbed from Talented.  I like the way jerry thinks: the first argument
 	-- can be a format spec for the remainder of the arguments.  (The new
 	   or (g_loot.forum and g_loot.forum ~= "")
 	   or (g_loot.attend and g_loot.attend ~= "")
 	then
 		g_loot.autoshard = self.sharder
 		g_loot.threshold = self.threshold
-		--OuroLootSV = g_loot
-		--for i,e in ipairs(OuroLootSV) do
 		for i,e in ipairs(g_loot) do
 			e.cols = nil
 		end
 		OuroLootSV = g_loot
 	end
-	self.history.kind = nil
+	for r,t in pairs(self.history_all) do if type(t) == 'table' then
-	self.history.st = nil
+		t.realm = nil
-	self.history.byname = nil
+		t.st = nil
+		t.byname = nil
+	end end
 	OuroLootSV_hist = self.history_all
+	--OuroLootSV_hist.PLAYER_LOGOUT = true
 end
 function addon:RAID_ROSTER_UPDATE (event)
 	if GetNumRaidMembers() > 0 then
 		local inside,whatkind = IsInInstance()
 -- helper for CHAT_MSG_LOOT handler
 do
 	-- Recent loot cache
 	addon.recent_loot = create_new_cache ('loot', comm_cleanup_ttl)
-	local GetItemInfo = GetItemInfo
+	local GetItemInfo, GetItemIcon = GetItemInfo, GetItemIcon
 	-- 'from' and onwards only present if this is triggered by a broadcast
 	function addon:_do_loot (local_override, recipient, itemid, count, from, extratext)
-		local iname, ilink, iquality, _,_,_,_,_,_, itexture = GetItemInfo(itemid)
+		local itexture = GetItemIcon(itemid)
-		if not iname then return end   -- sigh
+		--local iname, ilink, iquality, _,_,_,_,_,_, itexture = GetItemInfo(itemid)
+		local iname, ilink, iquality = GetItemInfo(itemid)
+		if (not iname) or (not itexture) then
+			iname, ilink, iquality, itexture =
+				UNKNOWN..': '..itemid, 'item:6948', ITEM_QUALITY_COMMON, [[ICONS\INV_Misc_QuestionMark]]
+		end
 		self.dprint('loot',">>_do_loot, R:", recipient, "I:", itemid, "C:", count, "frm:", from, "ex:", extratext)
 		local i
 		itemid = tonumber(ilink:match("item:(%d+)"))
 		if local_override or ((iquality >= self.threshold) and not opts.itemfilter[itemid]) then
 --     }, ......
 --   },
 --   ["OtherRealm"] = ......
 -- }
 do
+	local tsort = table.sort
+	local comp = function(L,R) return L.when > R.when end
 	-- Builds the map of names to array indices, using passed table or
 	-- self.history, and stores the result into its 'byname' field.  Also
 	-- called from the GUI code at least once.
 	function addon:_build_history_names (opt_hist)
 		local hist = opt_hist or self.history
 	-- Prepares and returns table to be used as self.history.
 	function addon:_prep_new_history_category (prev_table, realmname)
 		local t = prev_table or {
 			--kind = 'realm',
-			realm = realmname,
+			--realm = realmname,
 		}
+		t.realm = realmname
 		--[[
 		t.cols = setmetatable({
 			{ value = realmname },
 		}, self.time_column1_used_mt)
 		return t
 	end
 	-- Maps a name to an array index, creating new tables if needed.  Returns
+	-- the index and the table at that index.
 	function addon:get_loot_history (name)
 		local i
 		i = self.history.byname[name]
 		if not i then
 			i = #self.history + 1
 			self.history[i] = { name=name }
 			self.history.byname[name] = i
 		end
-		return self.history[i]
+		return i, self.history[i]
 	end
 	function addon:_addHistoryEntry (lootindex)
 		local e = g_loot[lootindex]
-		local h = self:get_loot_history(e.person)
+		if e.kind ~= 'loot' then return end
+		local i,h = self:get_loot_history(e.person)
 		local n = {
 			id = e.id,
 			when = self:format_timestamp (g_today, e),
 			count = e.count,
 		}
-		h[#h+1] = n
+		tinsert (h, 1, n)
+	end
+	function addon:rewrite_history (realmname)
+		local r = assert(realmname)
+		self.history_all[r] = self:_prep_new_history_category (nil, r)
+		self.history = self.history_all[r]
+		local g_today_real = g_today
+		for i,e in ipairs(g_loot) do
+			if e.kind == 'time' then
+				g_today = e
+			elseif e.kind == 'loot' then
+				self:_addHistoryEntry(i)
+			end
+		end
+		g_today = g_today_real
+		self.hist_clean = nil
+		-- safety measure:  resort players' tables based on formatted timestamp
+		for i,h in ipairs(self.history) do
+			tsort (h, comp)
+		end
+	end
+	function addon:preen_history (realmname)
+		local r = assert(realmname)
+		for i,h in ipairs(self.history) do
+			tsort (h, comp)
+			while #h > 1 do
+				tremove (h)
+			end
+		end
 	end
 end
 ------ Player communication

Mercurial > wow > ouroloot

comparison core.lua @ 6:df3e27edbd60