Skip to content

Periodic inbox refresh #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neotron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Periodic inbox refresh #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions BulkMailInbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ local fmt = string.format
local lower = string.lower

local sortFields, markTable -- tables
local ibIndex, ibAttachIndex, numInboxItems, inboxCash, cleanPass, cashOnly, markOnly, takeAllInProgress, invFull, filterText -- variables
local ibIndex, ibAttachIndex, numInboxItems, inboxCash, cleanPass, cashOnly, markOnly, takeAllInProgress, invFull, filterText, guiDirty -- variables
local PERIODIC_GUI_UPDATE = 5
local spinnerText = { "Working ", "Working. ", "Working.. ", "Working..." }

--[[----------------------------------------------------------------------------
Expand Down Expand Up @@ -155,6 +156,8 @@ local function takeAll(cash, mark)
ibIndex = GetInboxNumItems()
ibAttachIndex = 0
takeAllInProgress = true
guiDirty = false
mod:SmartScheduleTimer('BMI_periodicRefresh', true, _periodicGUIRefresh, PERIODIC_GUI_UPDATE)
inboxCacheBuild()
mod:TakeNextItemFromMailbox()
end
Expand Down Expand Up @@ -411,6 +414,17 @@ local function _updateSpinner()
end
end

local function _periodicGUIRefresh()
mod:SmartCancelTimer('BMI_periodicRefresh')
if guiDirty then
mod:RefreshInboxGUI()
guiDirty = false
end
if takeAllInProgress then
mod:SmartScheduleTimer('BMI_periodicRefresh', true, _periodicGUIRefresh, PERIODIC_GUI_UPDATE)
end
end

function mod:TakeNextItemFromMailbox()
_updateSpinner()
if not takeAllInProgress then
Expand All @@ -424,7 +438,10 @@ function mod:TakeNextItemFromMailbox()
if cleanPass or numMails <= 0 then
takeAllInProgress = false
invFull = false
return self:RefreshInboxGUI()
mod:SmartCancelTimer('BMI_periodicRefresh')
local result = self:RefreshInboxGUI()
guiDirty = false
return result
else
ibIndex = numMails
ibAttachIndex = 0
Expand Down Expand Up @@ -453,7 +470,7 @@ function mod:TakeNextItemFromMailbox()

if (sender == "The Postmaster" or sender == "Thaumaturge Vashreen") and not itemName and money == 0 and not item then
DeleteInboxItem(curIndex)
self:SmartScheduleTimer('BMI_RefreshInboxGUI', false, "RefreshInboxGUI", 1)
guiDirty = true
self:SmartScheduleTimer('BMI_TakeNextItem', true, "TakeNextItemFromMailbox", 0.4)
return
end
Expand Down Expand Up @@ -488,7 +505,7 @@ function mod:TakeNextItemFromMailbox()

if actionTaken then
-- Since we did something, we'll add a delay to prevent erroring out
self:SmartScheduleTimer('BMI_RefreshInboxGUI', false, "RefreshInboxGUI", 1)
guiDirty = true
self:SmartScheduleTimer('BMI_TakeNextItem', true, "TakeNextItemFromMailbox", 0.4)
_fetchCount = _fetchCount + 1
else
Expand All @@ -515,6 +532,7 @@ end

function mod:InboxFrame_OnClick(parentself, index, attachment, ...)
takeAllInProgress = false
mod:SmartCancelTimer('BMI_periodicRefresh')
local _, _, _, _, money, cod, _, hasItem, _, wasReturned, _, canReply = GetInboxHeaderInfo(index)
if self.db.char.shiftTake and IsShiftKeyDown() then
if money > 0 then TakeInboxMoney(index)
Expand Down Expand Up @@ -607,6 +625,7 @@ function mod:HideInboxGUI()
mod:SmartCancelTimer('BMI_takeAll')
mod:SmartCancelTimer('BMI_TakeNextItem')
mod:SmartCancelTimer('BMI_RefreshInboxGUI')
mod:SmartCancelTimer('BMI_periodicRefresh')

if mod._toolbar then
mod._toolbar:Hide()
Expand Down Expand Up @@ -776,10 +795,12 @@ local function _createOrAttachSearchBar(tooltip)
-- stop taking items when search terms change or we might
-- end up taking stuff we didn't mean to take
mod:SmartCancelTimer('BMI_takeAll')
mod:SmartCancelTimer('BMI_periodicRefresh')
takeAllInProgress = false
_updateSpinner()
filterText = editBox:GetText():lower()
wipe(markTable)
guiDirty = false
mod:RefreshInboxGUI()
end)

Expand Down Expand Up @@ -807,7 +828,14 @@ local function _createOrAttachSearchBar(tooltip)

local cancelButton = CreateFrame("Button", "BulkMailInboxToolbarCancelButton", toolbar, "UIPanelCloseButton")
cancelButton:SetPoint("RIGHT", spinner, "LEFT", 0, 0)
cancelButton:SetScript("OnClick", function(self) takeAllInProgress = nil end)
cancelButton:SetScript("OnClick", function(self)
takeAllInProgress = nil
mod:SmartCancelTimer('BMI_periodicRefresh')
if guiDirty then
mod:RefreshInboxGUI()
guiDirty = false
end
end)
_addTooltipToFrame(cancelButton, L["Cancel"], L["Cancel taking items from the inbox."])
mod.buttons.Cancel = cancelButton

Expand Down