From 576a4587876736243320878b37dfdefdc4838761 Mon Sep 17 00:00:00 2001
From: rilgamon <robin@amiganiac.net>
Date: Sat, 13 Mar 2021 13:58:31 +0100
Subject: [PATCH] Move helper.lua to its own lib, readd own coinstring function

---
 Libs/embeds.xml            |   1 +
 Libs/zzAddOn/zzAddOn.lua   |   2 +-
 Libs/zzConfig/zzConfig.lua |   3 +-
 Libs/zzHelper/zzHelper.lua | 176 +++++++++++++++++++++++++++++++++++++
 Libs/zzLDB/zzLDB.lua       |   3 +-
 core.lua                   |   1 +
 helper.lua                 |  67 --------------
 pack.xml                   |   1 -
 8 files changed, 182 insertions(+), 72 deletions(-)
 create mode 100644 Libs/zzHelper/zzHelper.lua
 delete mode 100644 helper.lua

diff --git a/Libs/embeds.xml b/Libs/embeds.xml
index 6597053..9a9f19e 100755
--- a/Libs/embeds.xml
+++ b/Libs/embeds.xml
@@ -8,6 +8,7 @@
 	<Include file="AceLocale-3.0\AceLocale-3.0.xml"/>
 	<Script file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
 	<Script file="LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
+	<Script file="zzHelper\zzHelper.lua"/>
 	<Script file="zzLDB\zzLDB.lua"/>
 	<Script file="zzConfig\zzConfig.lua"/>
 	<Script file="zzAddOn\zzAddOn.lua"/>
diff --git a/Libs/zzAddOn/zzAddOn.lua b/Libs/zzAddOn/zzAddOn.lua
index a8e3e09..c684eda 100644
--- a/Libs/zzAddOn/zzAddOn.lua
+++ b/Libs/zzAddOn/zzAddOn.lua
@@ -1,4 +1,4 @@
-local lib, oldminor = LibStub:NewLibrary("zzAddOn", 1)
+local lib, oldminor = LibStub:NewLibrary("zzAddOn", 2)
 if not lib then return end
 oldminor = oldminor or 0
 lib['callbacks'] = lib['callbacks'] or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
diff --git a/Libs/zzConfig/zzConfig.lua b/Libs/zzConfig/zzConfig.lua
index cc91cd1..95b6db1 100644
--- a/Libs/zzConfig/zzConfig.lua
+++ b/Libs/zzConfig/zzConfig.lua
@@ -1,6 +1,5 @@
-local lib, oldminor = LibStub:NewLibrary("zzConfig", 1)
+local lib = LibStub:NewLibrary("zzConfig", 2)
 if not lib then return end
-oldminor = oldminor or 0
 local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
 local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
 local mixins = {'AddConfigMenu','AddConfigEntry','InitConfig'}
diff --git a/Libs/zzHelper/zzHelper.lua b/Libs/zzHelper/zzHelper.lua
new file mode 100644
index 0000000..1320a32
--- /dev/null
+++ b/Libs/zzHelper/zzHelper.lua
@@ -0,0 +1,176 @@
+local lib = LibStub:NewLibrary("zzHelper", 1)
+if not lib then return end
+local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
+
+--[[
+	*** Stringfunctions ***
+]]
+
+function lib:colorize(text, color)
+	return string.format("|cff%s%s|r",color and color or 'ffffff',text and text or '')
+end
+
+local iconbase = "\124TInterface\\MoneyFrame\\UI-%s:%d:%d:1:0\124t"
+local iconSize = 14
+local moneyText = {
+	gold = "G",
+	silver = "S",
+	copper = "C",
+	goldColor = lib:colorize("G", "daa520"),
+	silverColor = lib:colorize("S", "bfc1c2"),
+	copperColor = lib:colorize("C", "b87333"),
+}
+function lib:MoneyStringSetString(coin, str, col)
+	if(moneyText[coin]) then
+		moneyText[coin] = str
+		if(col) then
+			moneyText[format("%sColor",coin)] = col
+		end
+	end
+end
+function lib:MoneyStringSetSize(size)
+	if(size and size > 5 and size < 30) then
+		iconSize = size
+	end
+end
+function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size)
+	local iconSize =  size or iconSize
+	local goldicon = noicon and (noiconcolor and moneyText['gold'] or moneyText['goldColor']) or format(iconbase, 'Gold', iconSize, iconSize)
+	local silvericon = noicon and (noiconcolor and moneyText['silver'] or moneyText['silverColor']) or format(iconbase, 'Silver', iconSize, iconSize)
+	local coppericon = noicon and (noiconcolor and moneyText['copper'] or moneyText['copperColor']) or format(iconbase, 'Copper', iconSize, iconSize)
+
+	local moneystring = ''
+	local g,s,c
+	local neg = false
+	local abrev = ""
+	if(abrevM and money >= 10000000000) then
+		abrev = abrevM
+		money = lib:round(money / 10000000000,1) * 10000
+	elseif(abrevK and money >= 10000000) then
+		abrev = abrevK
+		money = lib:round(money / 10000000,1) * 10000
+	end
+	if(money <0) then 
+		neg = true
+		money = money * -1
+	end
+	if(abrev=="") then
+		g=floor(money/10000)
+		s=floor((money-(g*10000))/100)
+		c=money-s*100-g*10000
+	else
+		g = money/10000
+		s = 0
+		c = 0
+	end
+	if(money > 0) then
+		if(g>0) then
+			moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
+		end
+		if(s>0) then
+			moneystring = format("%s%s%s",moneystring, color and lib:colorize(s, neg and "ff0000" or "44dd44") or s, silvericon)
+		end
+		if(c>0) then
+			moneystring = format("%s%s%s",moneystring, color and lib:colorize(c, neg and "ff0000" or "44dd44") or c, coppericon)
+		end
+	else
+		moneystring = format("%s%s",color and '0' or '0', coppericon)
+	end
+	if(neg) then
+		moneystring = format("%s%s", lib:colorize("-","ff0000"), moneystring)
+	end
+	return moneystring
+end
+
+--[[
+	*** Mathfunctions ***
+]]
+
+function lib:round(num, idp)
+	return math.floor(num * (10^(idp or 0)) + 0.5) / (10^(idp or 0))
+end
+
+--[[
+	*** Arrayfunctions ***
+]]
+
+function lib:sortArray(tmp,dir)
+	local newtmp = {}
+	local n = 1
+	local cnt = 0
+	local maximum = 0
+	local first
+	for k,v in pairs(tmp) do
+		cnt = cnt + 1
+		if(v > maximum) then
+			maximum = v + 1
+		end
+		first = first or k
+	end
+	while(cnt > 0) do
+		local mx, mn = dir and maximum or 0,first
+		for k,v in pairs(tmp) do
+			if(dir) then
+				if(tonumber(v)<=tonumber(mx)) then
+					mx = v
+					mn = k
+				end
+			else
+				if(tonumber(v)>=tonumber(mx)) then
+					mx = v
+					mn = k
+				end
+			end
+		end
+		newtmp[n] = mn
+		tmp[mn] = nil
+		cnt = 0
+		for k,v in pairs(tmp) do
+			cnt = cnt + 1
+		end
+		n = n + 1
+		mn = 0
+		mx = dir and mx or 0
+	end
+	return newtmp
+end
+
+--[[
+	*** Charfunctions ***
+]]
+
+function lib:IsTwink(name)
+	local realm = GetRealmName()
+	local _
+	if(self['db']['sv']['profileKeys']) then
+		for k,v in pairs(self['db']['sv']['profileKeys']) do
+			local n,m = strsplit(" - ",k,2)
+			_,m = strsplit(" ",m,2)
+			if(n) then
+				if(n == name and m == realm) then
+					return true
+				end
+			end
+		end
+	end
+	return false
+end
+
+function lib:classcolor(text,class)
+	class = RAID_CLASS_COLORS[class] and class or "PRIEST"
+	return string.format("|c%s%s|r",RAID_CLASS_COLORS[class]['colorStr'],text)
+end
+
+--[[
+	*** End of functions ***
+]]
+
+function lib:Embed(target)
+  for _,name in pairs(mixins) do
+    target[name] = lib[name]
+  end
+  lib['targets'][target] = true
+end
+for target, _ in pairs(lib['targets']) do
+  lib:Embed(target)
+end
\ No newline at end of file
diff --git a/Libs/zzLDB/zzLDB.lua b/Libs/zzLDB/zzLDB.lua
index 550425b..99e84d5 100644
--- a/Libs/zzLDB/zzLDB.lua
+++ b/Libs/zzLDB/zzLDB.lua
@@ -1,4 +1,4 @@
-local lib, oldminor = LibStub:NewLibrary("zzLDB", 1)
+local lib, oldminor = LibStub:NewLibrary("zzLDB", 3)
 if not lib then return end
 local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
 local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
@@ -38,6 +38,7 @@ function lib:Embed(target)
   for _,name in pairs(mixins) do
     target[name] = lib[name]
   end
+  lib['ldbs'][target] = true
 end
 for target, _ in pairs(lib['ldbs']) do
   lib:Embed(target)
diff --git a/core.lua b/core.lua
index f641513..2d2b83b 100644
--- a/core.lua
+++ b/core.lua
@@ -1,6 +1,7 @@
 local addonName, addonTable = ...
 local childName = "zz_Money"
 local db, dbr, dbp, faction, realm
+LibStub("zzHelper"):Embed(addonTable)
 addonTable['events']  = addonTable['events']  or {}
 local events = addonTable['events'] 
 local session = { start = 0,	income = 0,	expense = 0 }
diff --git a/helper.lua b/helper.lua
deleted file mode 100644
index 24593cf..0000000
--- a/helper.lua
+++ /dev/null
@@ -1,67 +0,0 @@
-local addonName, addonTable = ...
-function addonTable:colorize(text, color)
-	return string.format("|cff%s%s|r",color and color or 'ffffff',text and text or '')
-end
-function addonTable:classcolor(text,class)
-	class = RAID_CLASS_COLORS[class] and class or "PRIEST"
-	return string.format("|c%s%s|r",RAID_CLASS_COLORS[class]['colorStr'],text)
-end
-function addonTable:round(num, idp)
-	return math.floor(num * (10^(idp or 0)) + 0.5) / (10^(idp or 0))
-end
-function addonTable:sortArray(tmp,dir)
-	local newtmp = {}
-	local n = 1
-	local cnt = 0
-	local maximum = 0
-	local first
-	for k,v in pairs(tmp) do
-		cnt = cnt + 1
-		if(v > maximum) then
-			maximum = v + 1
-		end
-		first = first or k
-	end
-	while(cnt > 0) do
-		local mx, mn = dir and maximum or 0,first
-		for k,v in pairs(tmp) do
-			if(dir) then
-				if(tonumber(v)<=tonumber(mx)) then
-					mx = v
-					mn = k
-				end
-			else
-				if(tonumber(v)>=tonumber(mx)) then
-					mx = v
-					mn = k
-				end
-			end
-		end
-		newtmp[n] = mn
-		tmp[mn] = nil
-		cnt = 0
-		for k,v in pairs(tmp) do
-			cnt = cnt + 1
-		end
-		n = n + 1
-		mn = 0
-		mx = dir and mx or 0
-	end
-	return newtmp
-end
-function addonTable:IsTwink(name)
-	local realm = GetRealmName()
-	local _
-	if(self['db']['sv']['profileKeys']) then
-		for k,v in pairs(self['db']['sv']['profileKeys']) do
-			local n,m = strsplit(" - ",k,2)
-			_,m = strsplit(" ",m,2)
-			if(n) then
-				if(n == name and m == realm) then
-					return true
-				end
-			end
-		end
-	end
-	return false
-end
\ No newline at end of file
diff --git a/pack.xml b/pack.xml
index c1bc050..c21994d 100644
--- a/pack.xml
+++ b/pack.xml
@@ -3,7 +3,6 @@
 	<script file="locale_koKR.lua"/>
 	<script file="locale_enUS.lua"/>
 	<script file="locale_ruRU.lua"/>
-	<Script file="helper.lua"/>
 	<Script file="prefs.lua"/>
 	<Script file="broker.lua"/>
 	<Script file="banker.lua"/>