Version 0.9.1-rc

- emote detection mixed in other channels
- minimap button and dialog no longer resets active state after profile change
- default entries are no longer shown after example import
- better handling of capture groups and character sets
This commit is contained in:
2020-08-01 01:35:47 +02:00
parent bafb116bb9
commit 45099a9a3b
17 changed files with 326 additions and 163 deletions

View File

@@ -2,8 +2,8 @@
local _G = _G
local Grichelde = _G.Grichelde or {}
local pairs, find, cGreen, cOrange, cRed, toNumber
= Grichelde.F.pairs, Grichelde.F.find, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
local pairs, tSize, tClone, find, sub, cGreen, cOrange, cRed, toNumber
= Grichelde.F.pairs, Grichelde.F.tSize,Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
function Grichelde:Upgrade_To_v060()
self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.6.0"))
@@ -90,67 +90,96 @@ function Grichelde:Upgrade_To_v090()
end
function Grichelde:UpgradeDatabase()
local dbVersion = self.db.global.version or "0.0.0"
self:DebugPrint("Database version:", dbVersion)
local dbMajor, dbMinor, dbPatch = self:ParseVersion(dbVersion)
local gMajor, gMinor, gPatch = self:ParseVersion(self.version)
local downGrade = false
if (dbMajor > gMajor) then
downGrade = true
elseif dbMajor == gMajor then
if (dbMinor > gMinor) then
downGrade = true
elseif dbMinor == gMinor then
if (dbPatch > gPatch) then
downGrade = true
local function parseVersion(version)
local _, _, major, minor, patch, ext = find(version, "(%d+)%.(%d+)%.(%d+)(.*)")
local preBuild, build = ext, ""
if (sub(ext, 1, 1) == "-") then
local b = find(ext, "+", 2)
if (b ~= nil) then
preBuild = sub(ext, 1, b)
build = sub(ext, b + 1)
else
preBuild = sub(ext, 1, b)
end
end
return toNumber(major) or 0, toNumber(minor) or 0, toNumber(patch) or 0, preBuild, build
end
if downGrade then
self:PrefixedPrint(cRed(self.L.Downgrade_Detected), self.L.AddonName)
else
local upgrade = 0
local error = false
local gMajor, gMinor, gPatch = parseVersion(self.version)
local dbVersion = self.db.global.version
if (dbMajor == 0) then
if (dbMinor < 6) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v060(dbVersion)
end
if (dbMinor < 7) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v070(dbVersion)
end
if (dbMinor == 7) then
if (dbPatch < 2) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v072(dbVersion)
if (dbVersion == nil) then
self:DebugPrint("New installation detected, add sample mappings")
-- do NOT set self.db.profile.replacements = {} it will break defaults
local sampleRepl = self.getDefaultSampleMappings()
for replName, replTable in pairs(sampleRepl) do
self:TracePrint("UpgradeDatabase : copySampleMappings %s", replName)
self.db.profile.replacements[replName] = tClone(replTable)
end
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
self:DebugPrint("Database version %s sucessfully created", self.db.global.version)
else
-- detect if upgrade is neccessary or downgrade was done
self:DebugPrint("Detected database version:", dbVersion)
local dbMajor, dbMinor, dbPatch = parseVersion(dbVersion)
local downGrade = false
if (dbMajor > gMajor) then
downGrade = true
elseif dbMajor == gMajor then
if (dbMinor > gMinor) then
downGrade = true
elseif dbMinor == gMinor then
if (dbPatch > gPatch) then
downGrade = true
end
end
if (dbMinor < 8) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v080(dbVersion)
end
if (dbMinor < 9) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v090(dbVersion)
end
end
if (upgrade == 0) or (error == false) then
-- bump version number even if no update is required
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
end
if (upgrade == 0) then
self:DebugPrint("Database up-to-date")
elseif (error == false) then
self:PrefixedPrint(cGreen(self.L.Upgrade_Successful))
if downGrade then
self:PrefixedPrint(cRed(self.L.Downgrade_Detected), self.L.AddonName)
else
self:PrefixedPrint(cRed(self.L.Upgrade_Error))
local upgrade = 0
local error = false
if (dbMajor == 0) then
if (dbMinor < 6) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v060(dbVersion)
end
if (dbMinor < 7) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v070(dbVersion)
end
if (dbMinor == 7) then
if (dbPatch < 2) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v072(dbVersion)
end
end
if (dbMinor < 8) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v080(dbVersion)
end
if (dbMinor < 9) then
upgrade = upgrade + 1
dbMajor, dbMinor, dbPatch = self:Upgrade_To_v090(dbVersion)
end
end
if (upgrade == 0) or (error == false) then
-- bump version number even if no update is required
self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
end
if (upgrade == 0) then
self:DebugPrint("Database was up-to-date")
elseif (error == false) then
self:PrefixedPrint(cGreen(self.L.Upgrade_Successful))
else
self:PrefixedPrint(cRed(self.L.Upgrade_Error))
end
end
end
end