wow/ouroloot: core.lua comparison

comparison core.lua @ 107:35b55c6f5551

Cleanups and reminders to myself.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Mon, 06 Aug 2012 13:14:38 -0400
parents	095ee38508e8
children	04ccd12c2a41

comparison

equal deleted inserted replaced

-:095ee38508e8
+:35b55c6f5551
 local opts				= nil
 local error				= addon.error
 local assert			= addon.assert
--- for speeding up local loads, not because I think _G will change
+local type, select, next, pairs, ipairs, tinsert, tremove, tostring, tonumber, wipe =
-local _G = _G
+	type, select, next, pairs, ipairs, table.insert, table.remove, tostring, tonumber, table.wipe
-local type = _G.type
-local select = _G.select
-local pairs = _G.pairs
-local ipairs = _G.ipairs
-local tinsert = _G.table.insert
-local tremove = _G.table.remove
-local tostring = _G.tostring
-local tonumber = _G.tonumber
-local wipe = _G.table.wipe
 local pprint, tabledump = addon.pprint, flib.tabledump
-local CopyTable = _G.CopyTable
+local CopyTable = CopyTable
-local GetNumRaidMembers = _G.GetNumGroupMembers or _G.GetNumRaidMembers
+local GetNumRaidMembers = GetNumGroupMembers or GetNumRaidMembers
-local IsInRaid = _G.IsInRaid or (function() return GetNumRaidMembers() > 0 end)
+local IsInRaid = IsInRaid or (function() return GetNumRaidMembers() > 0 end)
 -- En masse forward decls of symbols defined inside local blocks
 local _register_bossmod, makedate, create_new_cache, _init, _log, _do_loot_metas
 local _history_by_loot_id, _setup_unique_replace, _unavoidable_collision
 local _notify_about_change
 -- Hypertext support, inspired by DBM broadcast pizza timers
 do
 	local hypertext_format_str = "|HOuroLoot:%d|h%s[%s]|r|h"
 	local func_map = {} --_G.setmetatable({}, {__mode = 'k'})
-	local text_map = {} _G.setmetatable({}, {__mode = 'v'})
+	local text_map = setmetatable({}, {__mode = 'v'})
-	local base = _G.newproxy(true)
+	local base = newproxy(true)
-	_G.getmetatable(base).__tostring = function(ud) return text_map[ud] end
+	getmetatable(base).__tostring = function(ud) return text_map[ud] end
 	--@debug@
 	-- auto collecting these tokens is an interesting micro-optimization but not yet
-	_G.getmetatable(base).__index = {
+	getmetatable(base).__index = {
 		['done'] = function (ud)
 			text_map[ud] = nil
 			func_map[ud] = nil
 		end,
 	}
-	_G.getmetatable(base).__gc = function(ud)
+	getmetatable(base).__gc = function(ud)
 		print("Collecting hyperlink object <",tostring(ud),">")
 	end
 	--@end-debug@
 	-- TEXT will automatically be surrounded by brackets
 	-- in chat.  The MethodName and raw function callbacks will both be
 	-- passed the addon table and the same matching number.
 	--
 	-- This is largely an excuse to fool around with Lua data constructs.
 	function addon.format_hypertext (text, color, func)
-		local ret = _G.newproxy(base)
+		local ret = newproxy(base)
 		local num = #text_map + 1
 		text_map[ret] = hypertext_format_str:format (num,
 				type(color)=='number' and ITEM_QUALITY_COLORS[color].hex or color,
 				text)
 		text_map[num] = ret
 	mousebutton:  "LeftButton", "MiddleButton", "RightButton"
 	amusingly, print()'ing the fullstring below as a debugging aid yields
 	another clickable link, yay data reproducability
 	]]
-	local strsplit = _G.strsplit
+	local strsplit = strsplit
 	DEFAULT_CHAT_FRAME:HookScript("OnHyperlinkClick", function(self, link, fullstring, mousebutton)
 		local ltype, arg = strsplit(":",link)
 		if ltype ~= "OuroLoot" then return end
 		arg = tonumber(arg)
 		local f = func_map[text_map[arg]]
 	-- If unique keys ever change into objects instead of strings, change
 	-- this into a weakly-keyed table.
 	mt = { __metatable = 'Should be using setmode.' }
-	g_uniques = _G.setmetatable (m_reset{}, mt)
+	g_uniques = setmetatable (m_reset{}, mt)
 end
 ------ Expiring caches
 --[[
 end
 end
 ]]
 do
 	local caches = {}
-	local cleanup_group = _G.AnimTimerFrame:CreateAnimationGroup()
+	local cleanup_group = AnimTimerFrame:CreateAnimationGroup()
-	local time, next = _G.time, _G.next
+	local time, next = time, next
 	local new, del = flib.new, flib.del
 	cleanup_group:SetLooping("REPEAT")
 	cleanup_group:SetScript("OnLoop", function(cg)
 		addon.dprint('cache',"OnLoop firing")
 		local now = time()
 function addon:OnInitialize()
 	if self.author_debug then
 		_G.OL = self
 		_G.g_uniques = g_uniques
 	end
-	_log = _G.OuroLootSV_log
+	_log = OuroLootSV_log
 	-- VARIABLES_LOADED has fired by this point; test if we're doing something like
 	-- relogging during a raid and already have collected loot data
-	local OuroLootSV = _G.OuroLootSV
+	local OuroLootSV = OuroLootSV
 	g_restore_p = OuroLootSV ~= nil
 	self.dprint('flow', "oninit sets restore as", g_restore_p)
 	-- Primarily for plugins, but can be of use to me also...
-	self.callbacks = _G.LibStub("CallbackHandler-1.0"):New(self)
+	self.callbacks = LibStub("CallbackHandler-1.0"):New(self)
 	--function self.callbacks:OnUsed (target_aka_self, eventname)  end
 	--function self.callbacks:OnUnused (target_aka_self, eventname)  end
 	if _G.OuroLootOptsDB == nil then
 		local vclick = self.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON, 'help')
 			virgin = nil
 		end,10,self)
 	else
 		virgin = nil
 	end
-	self.db = _G.LibStub("AceDB-3.0"):New("OuroLootOptsDB", option_defaults , --[[Default=]]true)
+	self.db = LibStub("AceDB-3.0"):New("OuroLootOptsDB", option_defaults , --[[Default=]]true)
 	self.db.RegisterCallback (self, "OnNewProfile", function()
 		self:Print(new_profile_warning)
 	end)
 	self.db.RegisterCallback (self, "OnProfileChanged", "DBProfileRefresh")
 	self.db.RegisterCallback (self, "OnProfileCopied", "DBProfileRefresh")
 			n = n + 1
 		end
 	end
 	self.history_all = self.history_all or _G.OuroLootSV_hist or {}
-	local r = self:load_assert (_G.GetRealmName(), "how the freak does GetRealmName() fail?")
+	local r = self:load_assert (GetRealmName(), "how the freak does GetRealmName() fail?")
 	self.history_all[r] = self:_prep_new_history_category (self.history_all[r], r)
 	self.history = self.history_all[r]
 	local histformat = self.history_all.HISTFORMAT
 	self.history_all.HISTFORMAT = nil   -- don't keep this in live data
 	??? do something with LOOT_ITEM_WHILE_PLAYER_INELIGIBLE for locked LFRs?
 	]]
 	-- LOOT_ITEM = "%s receives loot: %s." --> (.+) receives loot: (.+)%.
-	g_LOOT_ITEM_ss = _G.LOOT_ITEM:gsub('%.$','%%.'):gsub('%%s','(.+)')
+	g_LOOT_ITEM_ss = LOOT_ITEM:gsub('%.$','%%.'):gsub('%%s','(.+)')
 	-- LOOT_ITEM_MULTIPLE = "%s receives loot: %sx%d." --> (.+) receives loot: (.+)(x%d+)%.
-	g_LOOT_ITEM_MULTIPLE_sss = _G.LOOT_ITEM_MULTIPLE:gsub('%.$','%%.'):gsub('%%s','(.+)'):gsub('x%%d','(x%%d+)')
+	g_LOOT_ITEM_MULTIPLE_sss = LOOT_ITEM_MULTIPLE:gsub('%.$','%%.'):gsub('%%s','(.+)'):gsub('x%%d','(x%%d+)')
 	-- LOOT_ITEM_SELF = "You receive loot: %s." --> You receive loot: (.+)%.
-	g_LOOT_ITEM_SELF_s = _G.LOOT_ITEM_SELF:gsub('%.$','%%.'):gsub('%%s','(.+)')
+	g_LOOT_ITEM_SELF_s = LOOT_ITEM_SELF:gsub('%.$','%%.'):gsub('%%s','(.+)')
 	-- LOOT_ITEM_SELF_MULTIPLE = "You receive loot: %sx%d." --> You receive loot: (.+)(x%d+)%.
-	g_LOOT_ITEM_SELF_MULTIPLE_ss = _G.LOOT_ITEM_SELF_MULTIPLE:gsub('%.$','%%.'):gsub('%%s','(.+)'):gsub('x%%d','(x%%d+)')
+	g_LOOT_ITEM_SELF_MULTIPLE_ss = LOOT_ITEM_SELF_MULTIPLE:gsub('%.$','%%.'):gsub('%%s','(.+)'):gsub('x%%d','(x%%d+)')
 	--[[
 	Stick something in the Blizzard addons options list, where most users
 	will probably look these days.  Try to be conservative about needless
 	frame creation.
 	bliz:SetScript("OnShow", function(_b)
 		local button = CreateFrame("Button",nil,_b,"UIPanelButtonTemplate")
 		button:SetWidth(150)
 		button:SetHeight(22)
 		button:SetScript("OnClick", function()
-			_G.InterfaceOptionsFrameCancel:Click()
+			InterfaceOptionsFrameCancel:Click()
-			_G.HideUIPanel(GameMenuFrame)
+			HideUIPanel(GameMenuFrame)
 			addon:OpenMainDisplayToTab"Options"
 		end)
 		button:SetText('"/ouroloot opt"')
 		button:SetPoint("TOPLEFT",20,-20)
 		_b:SetScript("OnShow",nil)
 	end)
-	_G.InterfaceOptions_AddCategory(bliz)
+	InterfaceOptions_AddCategory(bliz)
 	-- Maybe load up g_uniques now?
 	if opts.precache_history_uniques then
 		self:_cache_history_uniques()
 	end
 	-- etc.  So firing a callback is delayed ever so briefly by human scales.
 	--
 	-- For data safety, we replace any table arguments with read-only proxies
 	-- before passing them to the callbacks.  The goal is to prevent accidents,
 	-- not fraud.
-	local unpack, setmetatable = _G.unpack, _G.setmetatable
+	local unpack, setmetatable = unpack, setmetatable
 	local mtnewindex = function() --[[local]]error("This table is read-only", 3) end
 	local function make_readonly (t)
 		return setmetatable({}, {
 			__newindex = mtnewindex,
 			__index = t,
 	_G.OuroLootSV = nil
 	_G.OuroLootSV_saved = nil
 	_G.OuroLootOptsDB = nil
 	_G.OuroLootSV_hist = nil
 	_G.OuroLootSV_log = nil
-	_G.ReloadUI()
+	ReloadUI()
 end
 function addon:PLAYER_LOGOUT()
 	self:UnregisterEvent(RAID_ROSTER_UPDATE_EVENT)
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
-	local worth_saving = #g_loot > 0 or _G.next(g_loot.raiders)
+	local worth_saving = #g_loot > 0 or next(g_loot.raiders)
 	if not worth_saving then for text in self:registered_textgen_iter() do
 		worth_saving = worth_saving or g_loot.printed[text] > 0
 	end end
 	if worth_saving then
 		opts.autoshard = self.sharder
 		if not g_unique_replace then _setup_unique_replace() end
 		g_unique_replace.new_entry (g_unique_replace.me, existing, replace, 'improv')
 		addon:vbroadcast('improv', g_unique_replace.me, existing, replace)
 	end
-	local random = _G.math.random
+	local random = math.random
 	local function _many_uniques_handle_it (u, prefix)
 		if u then
 			-- Check and alert for an existing value.
 			u = tostring(u)
 			if g_uniques[u].history ~= g_uniques.NOTFOUND then
 		wipe(candidates)
 		wipe(sigmap)
 	end
 	local recent_loot = create_new_cache ('loot', comm_cleanup_ttl+3, prefer_local_loots)
-	local strsplit, GetItemInfo, GetItemIcon, UnitClass =
+	local strsplit, GetItemInfo, GetItemIcon, UnitClass = strsplit, GetItemInfo, GetItemIcon, UnitClass
-		_G.strsplit, _G.GetItemInfo, _G.GetItemIcon, _G.UnitClass
 	-- 'from' only present if this is triggered by a broadcast
 	function _do_loot (self, local_override, recipient, unique, itemid, count, from, extratext)
 		local prefix = "_do_loot[" .. counter() .. "]"
 		local itexture = GetItemIcon(itemid)
 			end
 			self:Print "Baron Steamroller has been slain.  Congratulations on your rug."
 		elseif cmd == "debug" then
 			if arg then
-				self.is_guilded = _G.IsInGuild()
+				self.is_guilded = IsInGuild()
 				self.debug[arg] = not self.debug[arg]
-				_G.print(arg,self.debug[arg])
+				print(arg,self.debug[arg])
 				if self.debug[arg] then self.DEBUG_PRINT = true end
 			else
 				self.DEBUG_PRINT = not self.DEBUG_PRINT
 			end
 			self.dprint('flow', "Clear: display visible but eoiST not set??")
 		end
 		self.display:Hide()
 	end
 	g_restore_p = nil
-	_G.OuroLootSV = nil
+	OuroLootSV = nil
 	self:_reset_timestamps()
 	if verbose_p then
-		if (_G.OuroLootSV_saved and #_G.OuroLootSV_saved>0) then
+		if (OuroLootSV_saved and #OuroLootSV_saved>0) then
-			self:Print("Current loot data cleared, %d saved sets remaining.", #_G.OuroLootSV_saved)
+			self:Print("Current loot data cleared, %d saved sets remaining.", #OuroLootSV_saved)
 		else
 			self:Print("Current loot data cleared.")
 		end
 	end
 	_init(self,st)
 	-- 1)  logging happens, followed by reload or logout/login
 	-- 2)  _log points to SV_log
 	-- 3)  VARIABLES_LOADED replaces SV_log pointer with restored version
 	-- 4)  logging happens to _log table (now with no other references)
 	-- 5)  at logout, nothing new has been entered in the table being saved
-	local date = _G.date
+	local date = date
 	function addon:log_with_timestamp (msg)
 		tinsert (_log, date('%m/%d %H:%M:%S  ')..msg)
 	end
 end
 	local change_chatframe
 	function addon:_set_chatty_change_chatframe (arg, silent_p)
 		local frame
 		if type(arg) == 'number' then
-			arg = _G.math.min (arg, _G.NUM_CHAT_WINDOWS)
+			arg = math.min (arg, _G.NUM_CHAT_WINDOWS)
 			frame = _G['ChatFrame'..arg]
 		elseif type(arg) == 'string' then
 			frame = _G[arg]
 		end
 		if type(frame) == 'table' and type(frame.AddMessage) == 'function' then
 	local byindex, temp = {}, {}
 	local function sort (src, dest)
 		for k in pairs(src) do
 			temp[#temp+1] = k
 		end
-		_G.table.sort(temp)
+		table.sort(temp)
 		wipe(dest)
 		for i = 1, #temp do
 			dest[i] = src[temp[i]]
 		end
 	end
 		if not closest_boss then
 			fencepost = closest_time
 		elseif not closest_time then
 			fencepost = closest_boss
 		else
-			fencepost = _G.math.min(closest_time,closest_boss)
+			fencepost = math.min(closest_time,closest_boss)
 		end
 	end
 	return fencepost
 end
 do
 	function addon:snapshot_raid (only_inraid_p)
 		local ss = CopyTable(g_loot.raiders)
 		local instance,maxsize = instance_tag()
 		if only_inraid_p then
-			for name,info in _G.next, ss do
+			for name,info in next, ss do
 				if info.online == 3 then
 					ss[name] = nil
 				end
 			end
 		end
-		return ss, maxsize, instance, _G.time()
+		return ss, maxsize, instance, time()
 	end
 end
 -- Tie-in with Deadly Boss Mods (or other such addons)
 do
 	end
 end
 -- Adding entries to the loot record, and tracking the corresponding timestamp.
 do
-	local rawget, setmetatable = _G.rawget, _G.setmetatable
+	local rawget, setmetatable = rawget, setmetatable
 	--@debug@
 	local tos = {}
 	tos.time = function (e)
 		return e.startday.text
 	function addon._addLootEntry (e)
 		setmetatable(e,loot_entry_mt)
 		if not done_todays_date then do_todays_date() end
-		local h, m = _G.GetGameTime()
+		local h, m = GetGameTime()
 		--local localuptime = math.floor(GetTime())
-		local time_t = _G.time()
+		local time_t = 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)
+				e.unique = e.id .. (e.disposition or e.person) .. date("%Y/%m/%d %H:%M",e.stamp)
 			end
 			addon:Fire ('NewLootEntry', e)
 		end
 		local index = #g_loot + 1
 		g_loot[index] = e
 	end
 	function _setup_unique_replace ()
 		gur = {}
 		gur.cache = create_new_cache ('improv', 10, fixup_unique_replacements)
-		gur.me = tonumber(_G.UnitGUID('player'):sub(-7),16)
+		gur.me = tonumber(UnitGUID('player'):sub(-7),16)
 		gur.replacements = {}
 		gur.new_entry = new_entry
 		gur.get_previous_replacement = get_previous_replacement
 		g_unique_replace = gur
 		_setup_unique_replace  = nil
 			clicky = addon.format_hypertext(
 				[[ SYSTEM FAILURE -- RELEASE RINZLER ]], "|cffff0000",
 				function() StaticPopup_Show "OUROL_ARGH" end)
 		end
 		StaticPopupDialogs["OUROL_ARGH"].text = horrible_error_text:format(err_msg)
-		_G.PlaySoundFile ([[Interface\AddOns\Ouro_Loot\sfrr.ogg]], "Master")
+		PlaySoundFile ([[Interface\AddOns\Ouro_Loot\sfrr.ogg]], "Master")
 		addon:Print ("        ")
 		addon:Print ("        ", clicky)
 		addon:Print ("        ")
 	end
 end
 ------ Saved texts
 function addon:check_saved_table(silent_p)
-	local s = _G.OuroLootSV_saved
+	local s = OuroLootSV_saved
 	if s and (#s > 0) then return s end
-	_G.OuroLootSV_saved = nil
+	OuroLootSV_saved = nil
 	if not silent_p then self:Print("There are no saved loot texts.") end
 end
 function addon:save_list()
 	local s = self:check_saved_table(); if not s then return end
 		self:Print("#%d   %s    %d entries     %s", i, t.date, t.count, t.name)
 	end
 end
 function addon:save_saveas(name)
-	_G.OuroLootSV_saved = _G.OuroLootSV_saved or {}
+	OuroLootSV_saved = OuroLootSV_saved or {}
-	local SV = _G.OuroLootSV_saved
+	local SV = OuroLootSV_saved
 	local n = #SV + 1
 	local save = {
 		name = name,
 		date = makedate(),
 		count = #g_loot,
 		local new_uniques, uniques_bywhen, when_array = {}, {}, {}
 		for u,tstamp in pairs(p.when) do
 			uniques_bywhen[tstamp] = u
 			when_array[#when_array+1] = tstamp
 		end
-		_G.table.sort (when_array, compare_timestamps)
+		table.sort (when_array, compare_timestamps)
 		for i,tstamp in ipairs(when_array) do
 			new_uniques[i] = uniques_bywhen[tstamp]
 		end
 		p.unique = new_uniques
 	end
 				count = count + 1
 			end
 		end
 		for i,e in self:filtered_loot_iter('loot') do
 			if e.unique and e.unique ~= "" then
-				local hmmm = _G.rawget(g_uniques,e.unique)
+				local hmmm = rawget(g_uniques,e.unique)
 				if hmmm then
 					hmmm.loot = i
 				elseif e.disposition == 'shard' or e.disposition == 'gvault' then
 					g_uniques[e.unique] = { loot = i, history = g_uniques.NOTFOUND }
 					count = count + 1
 			-- Blessed be the lookup cache of the loot master.
 			g_uniques[U] = { loot = index, history = to_name }
 		end
 		local from_person_class = e.person_class or from_h.person_class
 			or (g_loot.raiders[from_name] and g_loot.raiders[from_name].class)
-			or select(2,_G.UnitClass(from_name))
+			or select(2,UnitClass(from_name))
 		e.person = to_name
 		e.person_class = to_h.person_class
 			or (g_loot.raiders[to_name] and g_loot.raiders[to_name].class)
-			or select(2,_G.UnitClass(to_name))
+			or select(2,UnitClass(to_name))
 		self.hist_clean = nil
 		self.loot_clean = nil
 		if how == "local" then
 			if opts.chatty_on_local_changes then

Mercurial > wow > ouroloot

comparison core.lua @ 107:35b55c6f5551