Text Indicator: Now elapsed time can be displayed for afk and offline statuses (Ticket #835)

Author: michaelspain

Diff for: GridStatus.lua

@@ -47,6 +47,8 @@ status.GetText = Grid2.Dummy
 status.GetExpirationTime = Grid2.Dummy
 -- duration in seconds: bar, icon, text indicators
 status.GetDuration = Grid2.Dummy
+-- start time: text indicators
+status.GetStartTime = Grid2.Dummy
 -- percent value: alpha, bar indicators
 status.GetPercent = Grid2.Dummy
 -- texture: icon indicator

Diff for: Options/modules/general/GridGeneral.lua

@@ -43,6 +43,8 @@ Grid2Options:AddGeneralOptions( "General", "Themes", {
 		longDurationStackFormat  = "%.1f:%d",
 		shortDurationStackFormat = "%.0f:%d",
 		invertDurationStack      = false,
+		secondsElapsedFormat     = "%ds",
+		minutesElapsedFormat     = "%dm",
 	}
 	shortFormat = used when duration >= 1 sec
 	longFormat  = used when duration <  1 sec
@@ -53,6 +55,13 @@ Grid2Options:AddGeneralOptions( "General", "Themes", {
 		"%s" = represents stacks,   becomes translated to/from: "%d" (integer number)
 --]]
 
+-- Update text indicators database
+local function UpdateTextIndicators()
+	for _, indicator in Grid2:IterateIndicators("text") do
+		indicator:UpdateDB()
+	end
+end
+
 -- Posible values for "Display tenths of a second" options
 local tenthsValues = { L["Never"], L["Always"] , L["When duration<1sec"] }
 
@@ -106,9 +115,7 @@ do
 			dbx["short"..formatType] = short
 			dbx["long" ..formatType] = long
 			if inverted ~= nil then	dbx.invertDurationStack = inverted end
-			for _, indicator in Grid2:IterateIndicators("text") do
-				indicator:UpdateDB()
-			end
+			UpdateTextIndicators()
 		end
 	end
 end
@@ -131,7 +138,7 @@ Grid2Options:AddGeneralOptions( "General", "Text Formatting", {
 		set = function (_, v) SetFormat("DecimalFormat", nil, v) end,
 		values = tenthsValues,
 	},
-	separator = { type = "description", name = "", order = 3 },
+	separator1 = { type = "description", name = "", order = 3 },
 	dsFormat = {
 		type = "input",
 		order = 4,
@@ -149,6 +156,35 @@ Grid2Options:AddGeneralOptions( "General", "Text Formatting", {
 		set = function (_, v) SetFormat("DurationStackFormat", nil, v) end,
 		values = tenthsValues
 	},
+	separator2 = { type = "description", name = "", order = 6 },
+	secFormat = {
+		type = "input",
+		order = 7,
+		name = L["Seconds Format"],
+		desc = L["Examples:\n%ds\n%d seconds"],
+		get = function() 
+			return Grid2.db.profile.formatting.secondsElapsedFormat 
+		end,
+		set = function(_,v)	
+			string.format(v, 1) -- sanity check, crash if v is not a correct format mask
+			Grid2.db.profile.formatting.secondsElapsedFormat  = v
+			UpdateTextIndicators()
+		end,
+	},
+	minFormat = {
+		type = "input",
+		order = 8,
+		name = L["Minutes Format"],
+		desc = L["Examples:\n%dm\n%d minutes"],
+		get = function() 
+			return Grid2.db.profile.formatting.minutesElapsedFormat 
+		end,
+		set = function(_,v)	
+			string.format(v, 1) -- sanity check, crash if v is not a correct format mask
+			Grid2.db.profile.formatting.minutesElapsedFormat  = v
+			UpdateTextIndicators()
+		end,
+	},
 })
 
 --==========================================================================

Diff for: modules/IndicatorText.lua

@@ -15,6 +15,8 @@ Grid2.defaults.profile.formatting = {
 	longDurationStackFormat  = "%.1f:%d",
 	shortDurationStackFormat = "%.0f:%d", 
 	invertDurationStack      = false,
+	secondsElapsedFormat     = "%ds",
+	minutesElapsedFormat     = "%dm",
 }
 
 local timers = {}
@@ -77,8 +79,14 @@ local function _UpdateSD(text)
 	end	
 end
 -- elapsed
+local FmtEM, FmtES
 local function UpdateE(text)
-	text:SetFormattedText( "%.0f", curTime - expirations[text]  )
+	local t = curTime - expirations[text]
+	if t>=60 then
+		text:SetFormattedText( FmtEM, t/60 )
+	else
+		text:SetFormattedText( FmtES, t  )
+	end	
 end
 -- duration
 local function UpdateD(text)
@@ -150,6 +158,14 @@ local function Text_OnUpdateDE(self, parent, unit, status)
 				self.updateFunc(Text)
 				return
 			end
+		elseif self.elapsed then
+			curTime = GetTime() -- not local because is used later by self.updateFunc
+			expirations[Text] = status:GetStartTime(unit) or curTime
+			if not timers[Text] then 
+				TimerStart(Text, self.updateFunc) 
+			end
+			self.updateFunc(Text)
+			return
 		else
 			Text:SetText( string_cut(status:GetText(unit) or "", self.textlength) )
 			if timers[Text] then TimerStop(Text) end
@@ -221,6 +237,8 @@ local function Text_UpdateDB(self)
 	FmtDE[false] = fmt.shortDecimalFormat
 	FmtDES[true] = fmt.longDurationStackFormat
 	FmtDES[false] = fmt.shortDurationStackFormat
+	FmtES = fmt.secondsElapsedFormat
+	FmtEM = fmt.minutesElapsedFormat
 	UpdateES = fmt.invertDurationStack and _UpdateSE or _UpdateES
 	UpdateDS = fmt.invertDurationStack and _UpdateSD or _UpdateDS
 	-- indicator dbx

Diff for: modules/StatusAFK.lua

@@ -5,12 +5,16 @@ local L = LibStub("AceLocale-3.0"):GetLocale("Grid2")
 local AFK = Grid2.statusPrototype:new("afk")
 
 local Grid2 = Grid2
+local GetTime = GetTime
 local UnitIsAFK = UnitIsAFK
 
+local afk_cache = setmetatable({}, {__index = function(t,k) local v=GetTime(); t[k]=v; return v end})
+
 AFK.GetColor = Grid2.statusLibrary.GetColor
 
 function AFK:UpdateUnit(_, unit)
 	if unit then
+		afk_cache[unit] = nil
 		self:UpdateIndicators(unit)
 	end
 end
@@ -27,14 +31,20 @@ function AFK:OnDisable()
 	self:UnregisterEvent("ZONE_CHANGED_NEW_AREA")
 	self:UnregisterEvent("READY_CHECK")
 	self:UnregisterEvent("READY_CHECK_FINISHED")
+	wipe(afk_cache)
 end
 
 function AFK:IsActive(unit)
 	return UnitIsAFK(unit)
 end
 
+function AFK:GetStartTime(unit)
+	return afk_cache[unit]
+end
+
+local text = L["AFK"]
 function AFK:GetText(unit)
-	return L["AFK"]
+	return text
 end
 
 local function CreateStatusAFK(baseKey, dbx)

Diff for: modules/StatusOffline.lua

@@ -87,6 +87,10 @@ function Offline:IsActive(unit)
 	return offline[unit]
 end
 
+function Offline:GetStartTime(unit)
+	return offline[unit]
+end
+
 local text = L["Offline"]
 function Offline:GetText(unit)
 	return text