diff --git a/WeakAuras/Libs/AceTimer-3.0/AceTimer-3.0.lua b/WeakAuras/Libs/AceTimer-3.0/AceTimer-3.0.lua index 929f458..f2304b4 100644 --- a/WeakAuras/Libs/AceTimer-3.0/AceTimer-3.0.lua +++ b/WeakAuras/Libs/AceTimer-3.0/AceTimer-3.0.lua @@ -16,7 +16,7 @@ -- @name AceTimer-3.0 -- @release $Id$ -local MAJOR, MINOR = "AceTimer-3.0", 117 -- Bump minor on changes +local MAJOR, MINOR = "AceTimer-3.0", 1017 -- Bump minor on changes local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceTimer then return end -- No upgrade needed @@ -296,10 +296,7 @@ for addon in next, AceTimer.embeds do end AceTimer.frame:SetScript("OnUpdate", function(self, elapsed) --- local total = 0 - for _, timer in next, activeTimers do - -- print(timer.timeleft, timer.object.name) if not timer.cancelled then if timer.timeleft > elapsed then timer.timeleft = timer.timeleft - elapsed @@ -327,8 +324,4 @@ AceTimer.frame:SetScript("OnUpdate", function(self, elapsed) end end end - --- if total == 0 then --- self:Hide() --- end end) \ No newline at end of file diff --git a/WeakAuras/Libs/Archivist/Archivist.lua b/WeakAuras/Libs/Archivist/Archivist.lua index e9e68d6..98bdeb1 100644 --- a/WeakAuras/Libs/Archivist/Archivist.lua +++ b/WeakAuras/Libs/Archivist/Archivist.lua @@ -15,7 +15,7 @@ local LibDeflate = LibStub("LibDeflate") do -- boilerplate & static values Archivist.buildDate = "@build-time@" - Archivist.version = "5d67e47" + Archivist.version = "5e673bb" --[===[@debug@ Archivist.debug = true --@end-debug@]===] @@ -108,6 +108,7 @@ end -- Open - function (requried). Create from the provided data an active store object. Prototype may assume ownership of the provided data however it wishes. -- Commit - function (required). Return an image of the data that should be archived. -- Close - function (required). Release ownership of active store object. Optionally, return image of data to write into archive. +-- Delete - function (optional). If provided, called when a store is deleted. Useful for cleaning up sub stores. -- Please note that Create, Open, Update (if provided), Commit, and Close may be called at any time if Archivist deems it necessary. -- Thus, these methods should ideally be as close to purely functional as is practical, to minimize friction. function Archivist:RegisterStoreType(prototype) @@ -129,6 +130,7 @@ function Archivist:RegisterStoreType(prototype) self:Assert(prototype.Update == nil or type(prototype.Update) == "function", "Invalid prototype field 'Update': Expected function, got %q instead.", type(prototype.Update)) self:Assert(type(prototype.Commit) == "function", "Invalid prototype field 'Commit': Expected function, got %q instead.", type(prototype.Commit)) self:Assert(type(prototype.Close) == "function", "Invalid prototype field 'Close': Expected function, got %q instead.", type(prototype.Close)) + self:Assert(prototype.Delete == nil or type(prototype.Delete) == "function", "Invalid prototype field 'Delete': Expected function, got %q instead.", type(prototype.Delete)) -- prototype is now guaranteed to have Init, Create, Open, Update functions, and is thus well-formed. end @@ -266,8 +268,10 @@ function Archivist:CloneStore(store, newId, openStore) return self:Clone(info.type, info.id, newId, openStore) end --- deletes archived data if store is not currently open --- Deleting unregistered store types must be done via setting force +-- Closes store (if open), then deletes data from archive +-- Prototype is given opportunity to perform actions using image (usually, to delete other sub stores) +-- if store type is not registered, then force flag must be set in order to delete data, +-- to reduce the chance of accidents function Archivist:Delete(storeType, id, force) do -- arg validation self:Warn(force or type(storeType == "string") and self.sv[storeType], "There are no stores to delete.") @@ -275,6 +279,12 @@ function Archivist:Delete(storeType, id, force) end if id and storeType and self.sv[storeType] then + if self.prototypes[id] and self.prototypes[id].Delete then + local image = self.activeStores[storeType][id] + and self:Close(self.activeStores[storeType][id]) + or self:Dearchive(self.sv[storeType][id]) + self.prototypes[storeType]:Delete(image) + end self.sv[storeType][id] = nil end end diff --git a/WeakAuras/Libs/Archivist/Archivist.toc b/WeakAuras/Libs/Archivist/Archivist.toc index 219e02d..2ae124e 100644 --- a/WeakAuras/Libs/Archivist/Archivist.toc +++ b/WeakAuras/Libs/Archivist/Archivist.toc @@ -1,7 +1,7 @@ ## Interface: 80300 ## Title: Archivist ## Author: emptyrivers -## Version: 5d67e47 +## Version: 5e673bb ## Notes: Flexible data archive. ## SavedVariables: ACHV_DB ## X-Curse-Project-ID: 354259 diff --git a/WeakAuras/Libs/Archivist/libs/LibDeflate/LibDeflate.lua b/WeakAuras/Libs/Archivist/libs/LibDeflate/LibDeflate.lua index 293d2ec..7dfab7d 100644 --- a/WeakAuras/Libs/Archivist/libs/LibDeflate/LibDeflate.lua +++ b/WeakAuras/Libs/Archivist/libs/LibDeflate/LibDeflate.lua @@ -61,9 +61,9 @@ Credits: --[[ Curseforge auto-packaging replacements: - Project Date: 2020-02-08T04:56:34Z - Project Hash: 5d67e47d65ff887b5593ad8324c9896745886e10 - Project Version: 5d67e47 + Project Date: 2020-06-09T17:59:15Z + Project Hash: 5e673bb068bdc39d810e133f2d6e19115f95e532 + Project Version: 5e673bb --]] local LibDeflate diff --git a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua index c1255f9..d25b53b 100644 --- a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua +++ b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua @@ -25,22 +25,22 @@ local defaultFramePriorities = { [9] = "^Grid2Layout", -- grid2 [10] = "^ElvUF_RaidGroup", -- elv [11] = "^oUF_bdGrid", -- bdgrid - [12] = "^oUF.*raid", -- generic oUF + [12] = "^oUF_.-Raid", -- generic oUF [13] = "^LimeGroup", -- lime [14] = "^SUFHeaderraid", -- suf - [15] = "^CompactRaid", -- blizz -- party frames - [16] = "^AleaUI_GroupHeader", -- Alea - [17] = "^SUFHeaderparty", --suf - [18] = "^ElvUF_PartyGroup", -- elv - [19] = "^oUF.*party", -- generic oUF - [20] = "^PitBull4_Groups_Party", -- pitbull4 + [15] = "^AleaUI_GroupHeader", -- Alea + [16] = "^SUFHeaderparty", --suf + [17] = "^ElvUF_PartyGroup", -- elv + [18] = "^oUF_.-Party", -- generic oUF + [19] = "^PitBull4_Groups_Party", -- pitbull4 + [20] = "^CompactRaid", -- blizz [21] = "^CompactParty", -- blizz -- player frame [22] = "^SUFUnitplayer", [23] = "^PitBull4_Frames_Player", [24] = "^ElvUF_Player", - [25] = "^oUF.*player", + [25] = "^oUF_.-Player", [26] = "^PlayerFrame", }