Modularise node icons

Author: blobles-dev

lua/blobsprofiler/client/cl_blobsprofiler.lua

@@ -389,7 +389,7 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 
 	if visualDataType == "table" then
 		childNode = useParent:AddNode(istable(nodeValue) and nodeValue.displayName or nodeKey)
-		childNode.Icon:SetImage(specialType && "icon16/folder_database.png" || "icon16/folder.png")
+		childNode.Icon:SetImage("icon16/folder.png")
 
 		childNode.oldExpand = childNode.SetExpanded
 
@@ -432,13 +432,9 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 			childNode.oldExpand(...)
 		end
 
-		if varType == "SQLite.Schema" then
-			if nodeValue["ID"] or nodeValue["Default"] or nodeValue["Not NULL"] then -- TODO: Gotta be a better way to determine if this is a SQL table entry
-				childNode.Label:SetText(nodeValue.Name)
-			end
-			if nodeValue["Primary Key"] then
-				childNode.Icon:SetImage("icon16/table_key.png")
-			end
+		local getModule = blobsProfiler.GetModule(varType)
+		if getModule.FormatNodeIcon and getModule.FormatNodeIcon(luaState, nodeKey, nodeValue) then
+			childNode.Icon:SetImage(getModule.FormatNodeIcon(luaState, nodeKey, nodeValue))
 		end
 	else
 		local nodeText = nodeKey
@@ -450,6 +446,10 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 
 		childNode = useParent:AddNode(nodeText)
 		childNode.Icon:SetImage("icon16/".. (blobsProfiler.TypesToIcon[visualDataType] || "page_white_text") ..".png")
+		
+		if getModule.FormatNodeIcon and getModule.FormatNodeIcon(luaState, nodeKey, nodeValue) then
+			childNode.Icon:SetImage(getModule.FormatNodeIcon(luaState, nodeKey, nodeValue))
+		end
 
 		childNode.DoClick = function()
 			if isRoot && useParent == parentNode && varType == "Globals" then
@@ -631,20 +631,6 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
 
 	childNode.varType = varType
 
-	if varType == "Profiling.Targets" and isRoot then
-		local fullModuleName = nodeData.key
-
-		local getModule = blobsProfiler.GetModule(fullModuleName)
-		if getModule and getModule.Icon then
-			childNode.Icon:SetImage(getModule.Icon)
-		end
-	end
-
-	local tblOverrides = blobsProfiler.GetIconOverrides(varType)
-	if tblOverrides and tblOverrides[dataType] then
-		childNode.Icon:SetImage(tblOverrides[dataType])
-	end
-
 	return childNode
 end
 

lua/blobsprofiler/shared/modules/bp_lua.lua

@@ -99,7 +99,14 @@ blobsProfiler.RegisterSubModule("Lua", "Globals", {
 
 		blobsProfiler.buildDTree(luaState, parentPanel, "Lua.Globals")
     end,
-    RefreshButton = "Re-scan" -- TODO: I couldn't get this to play nice, so I gave up for now
+    RefreshButton = "Re-scan",
+    FormatNodeIcon = function(luaState, nodeKey, nodeValue)
+        for _, varTypes in ipairs(blobsProfiler.Menu.GlobalTypesToCondense) do
+            if varTypes.prettyPlural == nodeKey then
+                return "icon16/folder_database.png"
+            end
+        end
+    end
 })
 
 local function luaExecuteFilesInit()
@@ -419,7 +426,7 @@ net.Receive("blobsProfiler:sendLua_versus", function(l, ply)
         end
     else
         blobsProfiler.Modules["Lua"].SubModules["Versus"].retrievingData = false 
-        
+
         local numIterations = net.ReadUInt(20)
 
         local lcTotalTime = net.ReadDouble()

lua/blobsprofiler/shared/modules/bp_profiling.lua

@@ -89,6 +89,14 @@ blobsProfiler.RegisterSubModule("Profiling", "Targets", {
     end,
     FormatNodeName = function(luaState, nodeKey, nodeValue)
         return nodeValue.name or nodeKey
+    end,
+    FormatNodeIcon = function(luaState, nodeKey, nodeValue)
+        local fullModuleName = nodeKey
+
+		local getModule = blobsProfiler.GetModule(fullModuleName)
+		if getModule and getModule.Icon then
+			return getModule.Icon
+		end
     end
 })
 

lua/blobsprofiler/shared/modules/bp_sqlite.lua

@@ -14,6 +14,7 @@ local function buildSQLiteSchemaTable()
         for _, tblData in ipairs(grabTableIndexData) do
 			if tblData.type == "table" then
 				SQLiteSchema.Tables[tblData.name] = {}
+
 				local grabTableColumnData = sql.Query("PRAGMA table_info(".. sql.SQLStr(tblData.name) ..");")
 				if grabTableColumnData then
 					for _, tblCol in ipairs(grabTableColumnData) do
@@ -24,6 +25,8 @@ local function buildSQLiteSchemaTable()
 						SQLiteSchema.Tables[tblData.name][tblCol.cid]["Type"] = tblCol.type or nil
 						SQLiteSchema.Tables[tblData.name][tblCol.cid]["Not NULL"] = tblCol.notnull or nil
 						SQLiteSchema.Tables[tblData.name][tblCol.cid]["Default"] = tblCol.dflt_value or nil
+
+                        SQLiteSchema.Tables[tblData.name][tblCol.cid].displayName = tblCol.name
 					end
 				end
 			elseif tblData.type == "index" then
@@ -123,11 +126,17 @@ blobsProfiler.RegisterSubModule("SQLite", "Schema", {
             },]]
         }
     },
-    TypeIconOverride = {
-        ["table"] = "icon16/table.png"
-    },
     FormatNodeName = function(luaState, nodeKey, nodeValue)
         return nodeKey .. ": " .. tostring(nodeValue)
+    end,
+    FormatNodeIcon = function(luaState, nodeKey, nodeValue)
+        if istable(nodeValue) and nodeValue["Primary Key"] then
+            return "icon16/table_key.png"
+        elseif not istable(nodeValue) then
+            return "icon16/page.png"
+        else
+            return "icon16/table.png"
+        end
     end
 })
 

lua/blobsprofiler/shared/sh_modules.lua

@@ -16,7 +16,8 @@ end
 
 blobsProfiler.GetModule = function(fullModuleName)
     local splitModuleName = string.Explode(".", fullModuleName)
-
+    if not blobsProfiler.Modules[splitModuleName[1]] then return end
+    
     if #splitModuleName == 1 then
         return blobsProfiler.Modules[splitModuleName[1]]
     else
@@ -27,9 +28,4 @@ end
 blobsProfiler.GetRCFunctionsTable = function(fullModuleName)
     local moduleTable = blobsProfiler.GetModule(fullModuleName)
     return moduleTable.RCFunctions or blobsProfiler.Menu.RCFunctions_DEFAULT
-end
-
-blobsProfiler.GetIconOverrides = function(fullModuleName)
-    local moduleTable = blobsProfiler.GetModule(fullModuleName)
-    return moduleTable.TypeIconOverride or nil
 end