Modularise dtree data type icon overrides

blobles-dev · blobles-dev · commit 84f6df17a2c9 · 2024-07-31T22:36:48.000+01:00
diff --git a/lua/blobsprofiler/client/cl_blobsprofiler.lua b/lua/blobsprofiler/client/cl_blobsprofiler.lua
@@ -45,12 +45,6 @@ blobsProfiler.TypesToIcon = {
 	["Entity"] = "page_white_world"
 }
 
-blobsProfiler.VarTypeIconOverride = {
-	["Schema"] = {
-		["table"] = "table"
-	}
-}
-
 blobsProfiler.Menu.GlobalTypesToCondense = {
 	{
 		type = "string",
@@ -403,10 +397,6 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 		childNode = useParent:AddNode(nodeKey)
 		childNode.Icon:SetImage(specialType && "icon16/folder_database.png" || "icon16/folder.png")
 
-		if blobsProfiler.VarTypeIconOverride[varType] and blobsProfiler.VarTypeIconOverride[varType][dataType] then
-			childNode.Icon:SetImage("icon16/" .. blobsProfiler.VarTypeIconOverride[varType][dataType] .. ".png")
-		end
-
 		childNode.oldExpand = childNode.SetExpanded
 		
 		childNode.NeedsLazyLoad = true -- TODO: add check to make sure there even is children?
@@ -470,10 +460,6 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 		childNode = useParent:AddNode(nodeText)
 		childNode.Icon:SetImage("icon16/".. (blobsProfiler.TypesToIcon[visualDataType] || "page_white_text") ..".png")
 
-		if blobsProfiler.VarTypeIconOverride[varType] and blobsProfiler.VarTypeIconOverride[varType][visualDataType] then
-			childNode.Icon:SetImage("icon16/" .. blobsProfiler.VarTypeIconOverride[varType][visualDataType] .. ".png")
-		end
-
 		childNode.DoClick = function()
 			if isRoot && useParent == parentNode && varType == "Globals" then
 				print("blobsProfiler: Non-foldered root for type: ".. type(nodeValue))
@@ -687,6 +673,12 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 		end
 	end
 
+	local tblOverrides = blobsProfiler.GetIconOverrides(varType)
+	if tblOverrides and tblOverrides[dataType] then
+		print("found", varType)
+		childNode.Icon:SetImage(tblOverrides[dataType])
+	end
+
 	return childNode
 end
 
diff --git a/lua/blobsprofiler/shared/modules/bp_sqlite.lua b/lua/blobsprofiler/shared/modules/bp_sqlite.lua
@@ -122,6 +122,9 @@ blobsProfiler.RegisterSubModule("SQLite", "Schema", {
                 icon = "icon16/table_multiple.png"
             },]]
         }
+    },
+    TypeIconOverride = {
+        ["table"] = "icon16/table.png"
     }
 })
 
diff --git a/lua/blobsprofiler/shared/sh_modules.lua b/lua/blobsprofiler/shared/sh_modules.lua
@@ -14,12 +14,24 @@ blobsProfiler.RegisterSubModule = function(ParentModule, Name, ModuleConfig)
     print("[blobsProfiler] ".. ParentModule .." SubModule: ".. Name .." - Loaded!")
 end
 
-blobsProfiler.GetRCFunctionsTable = function(fullModule)
-    local splitModuleName = string.Explode(".", fullModule)
+blobsProfiler.GetRCFunctionsTable = function(fullModuleName)
+    local splitModuleName = string.Explode(".", fullModuleName)
 
     if #splitModuleName == 1 then
         return blobsProfiler.Modules[splitModuleName[1]].RCFunctions or blobsProfiler.Menu.RCFunctions_DEFAULT
     else
         return blobsProfiler.Modules[splitModuleName[1]].SubModules[splitModuleName[2]].RCFunctions or blobsProfiler.Menu.RCFunctions_DEFAULT
     end
+end
+
+blobsProfiler.GetIconOverrides = function(fullModuleName)
+    local splitModuleName = string.Explode(".", fullModuleName)
+
+    if #splitModuleName == 1 then
+        return blobsProfiler.Modules[splitModuleName[1]].TypeIconOverride
+    else
+        return blobsProfiler.Modules[splitModuleName[1]].SubModules[splitModuleName[2]].TypeIconOverride
+    end
+
+    return nil
 end

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,9 @@ blobsProfiler.RegisterSubModule("SQLite", "Schema", {`
`122`	`122`	`icon = "icon16/table_multiple.png"`
`123`	`123`	`},]]`
`124`	`124`	`}`
	`125`	`+ },`
	`126`	`+ TypeIconOverride = {`
	`127`	`+ ["table"] = "icon16/table.png"`
`125`	`128`	`}`
`126`	`129`	`})`
`127`	`130`