wow/breuesk: Lists.lua comparison

comparison Lists.lua @ 8:b05fcb225c4a

player -> person fix trim bug when trimming all shortened IDs for persons list keys

author	John@Yosemite-PC
date	Wed, 07 Mar 2012 00:18:05 -0500
parents	241986f7066c
children	daed0597deba

comparison

equal deleted inserted replaced

-:241986f7066c
+:b05fcb225c4a
 -- ordering. Then the next 5, etc.
 --
 -- Handling conflicts:
 --
+-- todo: list-of-lists must not use int indices. those will lead to peril.
 bsk.lists = {}
-bsk.players = {}
+bsk.persons = {}
-local RaidList = {}
+local raidList = {}
-local ReserveList = {}
+local reserveList = {}
-local activeList = 0 -- temporary
+local activeListKey = 1 -- temporary
+local personsReverse = {}
 local tinsert = table.insert
 local sformat = string.format
 local getn = table.getn
 bsk:PrintTable(bsk.lists)
 end
 function bsk:PrintChanges()
 bsk:PrintTable(bsk.db.profile.changes)
 end
-function bsk:PrintPlayers()
+function bsk:PrintPersons()
-bsk:PrintTable(bsk.players)
+bsk:PrintTable(bsk.persons)
 end
 function bsk:PrintTable(table, depth)
 depth = depth or ""
 if not table then return end
 for i,v in pairs(table) do
 end
 --}}}
 function bsk:CreateWorkingStateFromChanges(changes)
-local playerBase = self.db.profile.players
+local personsBase = self.db.profile.persons
 local listBase = self.db.profile.listBase
 -- copy the base to the working state
 wipe(bsk.lists)
-wipe(bsk.players)
+wipe(bsk.persons)
+wipe(personsReverse)
 bsk:tcopy(bsk.lists,listBase)
-bsk:tcopy(bsk.players,playerBase)
+bsk:tcopy(bsk.persons,personsBase)
 -- now just go through the changes list applying each
 for i,v in ipairs(changes) do
 bsk:ProcessChange(v)
 end
 --  timestamp check. Issue warnings for anyone with a clock that's more than
 --  X seconds out of sync with the others. Seriously, why isn't NTP a standard
 --  setting on all operating systems ...
 function bsk:ProcessChange(change)
-if change.action == "AddPlayer" then
+if change.action == "AddPerson" then
-bsk:DoAddPlayer(change)
+bsk:DoAddPerson(change)
 elseif change.action == "CreateList" then
 bsk:DoCreateList(change)
-elseif change.action == "AddPlayerToList" then
+elseif change.action == "AddPersonToList" then
-bsk:DoAddPlayerToList(change)
+bsk:DoAddPersonToList(change)
-elseif change.action == "SuicidePlayer" then
+elseif change.action == "SuicidePerson" then
-bsk:DoSuicidePlayer(change)
+bsk:DoSuicidePerson(change)
 else
 bsk:Print("Unknown message encountered")
 bsk:PrintTable(change)
 assert(false)
 end
 -- routines.
 --
 -- Note that "undo" has no special voodoo to it. It's basically a change that
 -- reverses the prior change on the stack.
--- Players list
+-- persons list
-function bsk:DoAddPlayer(change)
+function bsk:DoAddPerson(change)
 assert(change)
-assert(change.arg.guid)
+assert(change.arg.id)
 local arg = change.arg
 -- require admin
-local players = bsk.players
+local persons = bsk.persons
 local name = arg.name
-local guid = arg.guid
+local id = arg.id
-assert(players[guid]==nil)
+assert(persons[id]==nil)
-players[guid] = name
+persons[id] = {main=name}
-players.time=change.time
+persons.time=change.time
+personsReverse[name] = id
 return true
 end
-function bsk:AddPlayer(name)
+function bsk:AddPerson(name)
-local players = bsk.players
+local persons = bsk.persons
 local guid = UnitGUID(name)
 -- TODO: check guid to be sure it's a player
 if not guid then
 self:Print(sformat("Could not add player %s - they must be in range or group",name))
 return
 end
-if players[guid] and players[guid] ~= name then
+local id = string.sub(guid,6) -- skip at least 0x0580 ...
-self:Print(sformat("Namechange detected for %s - new is %s, please rename the existing entry", players[guid], name))
+id = id:gsub("^0*(.*)","%1") -- nom all leading zeroes remaining
+if persons[id] and persons[id] ~= name then
+self:Print(sformat("Namechange detected for %s - new is %s, please rename the existing entry", persons[id], name))
 return
 end
-if players[guid] ~= nil then
+if persons[id] ~= nil then
-self:Print(sformat("%s is already in the players list; disregarding", name))
+self:Print(sformat("%s is already in the persons list; disregarding", name))
 return
 end
-local change = {action="AddPlayer",arg={name=name,guid=guid}}
+local change = {action="AddPerson",arg={name=name,id=id}}
-if bsk:DoAddPlayer(change) then
+if bsk:DoAddPerson(change) then
 bsk:CreateChange(change)
 end
 end
 function bsk:DoCreateList(change)
 if bsk:DoCreateList(change) then
 bsk:CommitChange(change)
 end
 end
-function bsk:DoAddPlayerToList(change)
+function bsk:DoAddPersonToList(change)
 local listIndex = change.arg.listIndex
 local slist = change.arg.slist
 local list = bsk.lists[listIndex]
 if #slist == 1 then -- end of list insertion - just one person
 return false
 end
 return true
 end
-function bsk:AddPlayerToList(name,list)
+function bsk:AddPersonToList(name,list)
 -- require admin
 local listIndex = bsk:GetListIndex(list)
-local slist = {name} -- TODO: support adding to elsewhere besides the end
+local id = personsReverse[name]
-local change = {action="AddPlayerToList",arg={name=name,listIndex=listIndex,slist=slist}}
+local slist = {id} -- TODO: support adding to elsewhere besides the end
+local change = {action="AddPersonToList",arg={id=id,listIndex=listIndex,slist=slist}}
 bsk:StartChange(change)
-if bsk:DoAddPlayerToList(change) then
+if bsk:DoAddPersonToList(change) then
 bsk:CommitChange(change)
 end
 end
-function bsk:DoRemovePlayer(change)
+function bsk:DoRemovePerson(change)
 -- return true
 end
-function bsk:RemovePlayer(name)
+function bsk:RemovePerson(name)
--- from both players and lists
+-- from both persons and lists
 end
-function bsk:DoSuicidePlayer(change)
+function bsk:DoSuicidePerson(change)
 local listIndex = change.arg.listIndex
 local list = bsk.lists[listIndex]
 local slist = shallowCopy(change.arg.list)
 -- the goal here is to rotate the suicide list by 1
 -- then we can just mash it on top of the intersection between the original
 --bsk:Print("After")
 --bsk:PrintTable(list)
 return true
 end
-function bsk:SuicidePlayer(name,list)
+function bsk:SuicidePerson(name,list)
 -- require admin
 bsk:PopulateRaidList()
 local listIndex = bsk:GetListIndex(list)
 local slist=bsk:GetSuicideList(name,bsk.lists[listIndex])
-local change = {action="SuicidePlayer",arg={names=names,list=slist,listIndex=listIndex}}
+local change = {action="SuicidePerson",arg={names=names,list=slist,listIndex=listIndex}}
 bsk:StartChange(change)
-if bsk:DoSuicidePlayer(change) then
+if bsk:DoSuicidePerson(change) then
 bsk:CommitChange(change)
 end
 end
 function bsk:TrimLists(time)
 -- apply first half
 bsk:CreateWorkingStateFromChanges(before)
 -- save this state permanently; trim the changes permanently
-bsk:tcopy(bsk.db.profile.players,bsk.players)
+bsk:tcopy(bsk.db.profile.persons,bsk.persons)
 bsk:tcopy(bsk.db.profile.listBase,bsk.lists)
-while bsk.db.profile.changes[1].time <= time do
+while bsk.db.profile.changes ~= nil and bsk.db.profile.changes[1] ~= nil and bsk.db.profile.changes[1].time <= time do
 table.remove(bsk.db.profile.changes,1)
 end
 -- using the trimmed list and the new bases, recreate the working state
 bsk:CreateWorkingStateFromChanges(bsk.db.profile.changes)
 end
 --}}}
 -- Higher order actions (ie calls other Doers){{{
-function bsk:AddMissingPlayers()
+function bsk:AddMissingPersons()
 bsk:PopulateRaidList()
 local t = {}
-for i,v in pairs(bsk.players) do
+for _,v in pairs(bsk.persons) do
-t[v] = true
+t[v.main] = true
-end
+-- TODO: also add alts here
-for i,v in pairs(RaidList) do
+end
+for i,_ in pairs(raidList) do
 if t[i] == nil then
-bsk:Print(sformat("Player %s is missing from the players list - adding",i))
+bsk:Print(sformat("Person %s is missing from the persons list - adding",i))
-bsk:AddPlayer(i)
+bsk:AddPerson(i)
 end
 end
 -- TODO: batch into a single op - no need to spam 25 messages in a row
 end
 function bsk:PopulateListRandom(index)
 bsk:PopulateRaidList()
 local list = bsk.lists[index]
 local t = {}
 --for i = 1,#list do
---    if not (RaidList(list[i]) or ReserveList(list[i])) then
+--    if not (raidList(list[i]) or reserveList(list[i])) then
 --        tinsert(t,)
 --    end
 --end
 end
 --}}}
 -- "Soft" actions- ie things that cause nonpermanent state {{{
 -- reserves
 function bsk:AddReserve(name)
-ReserveList[name]=true
+reserveList[name]=true
 -- TODO: communicate to others. don't store this in any way.
 end
 function bsk:RemoveReserve(name)
-ReserveList[name]=false
+reserveList[name]=false
 -- TODO: communicate to others. don't store this in any way.
 end
 --function bsk:GetActiveList()
 end
 function bsk:PopulateRaidList()
 local inParty = GetNumPartyMembers()
 local inRaid = GetNumRaidMembers()
-wipe(RaidList)
+wipe(raidList)
 if inRaid > 0 then
 for i = 1, inRaid do
-RaidList[UnitName(rID[i])]=true
+raidList[UnitName(rID[i])]=true
 end
 elseif inParty > 0 then
 for i = 1, inParty do
-RaidList[UnitName(pID[i])]=true
+raidList[UnitName(pID[i])]=true
 end
 -- Now add yourself as the last party member
-RaidList[UnitName("player")]=true
+raidList[UnitName("player")]=true
 else
 -- You're alone
-RaidList[UnitName("player")]=true
+raidList[UnitName("player")]=true
 end
 end
 -- undo rules!
 -- only the most recent event can be undone
 local pushing = false
 for i = 1, #list do
 if list[i] == name then
 pushing = true
 end
-if pushing and (RaidList[list[i]] or ReserveList[list[i]]) then
+if pushing and (raidList[list[i]] or reserveList[list[i]]) then
 tinsert(ret,list[i])
 end
 end
 return ret
 end

Mercurial > wow > breuesk

comparison Lists.lua @ 8:b05fcb225c4a