wow/inventory: Core.lua comparison

comparison Core.lua @ 61:d903b0a151d3

Command handler function is now private, no need to keep it global when you can use the global SlashCmdList["INVENTORIUM"](msg) instead. Added database updating mechanism. All database vars are now stored in profiles rather than global. Now refreshing options when a different profile is selected. Fixed an issue with minimum local and global stock values not being inherited from the defaults.

author	Zerotorescue
date	Wed, 22 Dec 2010 15:04:09 +0100
parents	03c0610e9c1e
children	fee06221176f

comparison

equal deleted inserted replaced

-:12c2b20ca843
+:d903b0a151d3
 local addon = select(2, ...);
 addon = LibStub("AceAddon-3.0"):NewAddon(addon, "Inventorium", "AceEvent-3.0");
 local AceGUI = LibStub("AceGUI-3.0");
+--@debug@
+local addonRevision = 1;
+--@end-debug@
+--[===[@non-debug@
+local addonRevision = @project-revision@;
+--@end-non-debug@]===]
 local AceConfigDialog, AceConfigRegistry, AceSerializer;
 local groupIdToName, groupIsVirtual, options = {}, {}, {};
 local includeTradeSkillItems = 500;
+local slashArgs = {};
+local slashError = "Wrong argument, the following arguments are available:";
 --  All modules must be able to retrieve our supported addons database, thus keep it public
 addon.supportedAddons = {};
 addon.supportedAddons.auctionPricing = {};
 addon.supportedAddons.itemCount = {};
 addon.supportedAddons.crafting = {};
+local function CommandHandler(message)
+	local cmd, arg = string.split(" ", (message or ""), 2);
+	cmd = string.lower(cmd);
+	if slashArgs[cmd] then
+		slashArgs[cmd](addon, arg);
+	else
+		print(slashError);
+	end
+end
 function addon:OnInitialize()
 	self:Debug("OnInitialize");
 	-- SAVED VARIABLES
 	local defaults = {
 		global = {
-			groups = {
+			version = nil,
-			},
+		},
+		profile = {
 			defaults = {
 				auctionPricingAddon = "Auctioneer",
 				itemCountAddon = "Altoholic",
 				craftingAddon = "AdvancedTradeSkillWindow",
-				minimumLocalStock = 20,
+				minLocalStock = 20,
 				alertBelowLocalMinimum = true,
-				minimumStock = 60, -- global stock
+				minGlobalStock = 60,
-				alertBelowMinimum = true, -- global stock
+				alertBelowGlobalMinimum = true,
 				summaryThresholdShow = 10,
 				restockTarget = 60,
 				minCraftingQueue = 0.05,
 				bonusQueue = 0.1,
 				priceThreshold = 0,
 					orange = 0.3,
 					yellow = 0.6,
 					green = 0.95,
 				},
 			},
+			groups = {
+			},
 		},
 		factionrealm = {
 			characters = {
 			},
 		},
 	};
 	-- Register our saved variables database
 	self.db = LibStub("AceDB-3.0"):New("InventoriumDB", defaults, true);
+	self.db.RegisterCallback(self, "OnProfileChanged", "RefreshConfig")
+	self.db.RegisterCallback(self, "OnProfileCopied", "RefreshConfig")
+	self.db.RegisterCallback(self, "OnProfileReset", "RefreshConfig")
+	if not self.db.global.version or self.db.global.version < addonRevision then
+		-- Is our database outdated? Then patch it.
+		if not self.db.global.version then
+			-- Old version was before version was saved, many changes were done in that revision
+			print("Updating Inventorium database from version " .. (self.db.global.version or "Unknown") .. " to version " .. addonRevision .. "...");
+			if self.db.global and self.db.global.defaults then
+				print("Moving all global data into your current profile...");
+				-- All data mustn't be global but profile-based
+				self.db.profile.defaults = CopyTable(self.db.global.defaults);
+				self.db.profile.groups = CopyTable(self.db.global.groups);
+				self.db.global.defaults = nil;
+				self.db.global.groups = nil;
+				CommandHandler = function()
+					print("You must /reload once to finalize the database updates.");
+				end;
+				CommandHandler();
+			end
+			if self.db.profile.defaults.minimumStock then
+				print("Copying the minimum stock value into the minimum global stock...");
+				-- We added another stock option and renamed the old to be more obvious about what it means
+				self.db.profile.defaults.minGlobalStock = self.db.profile.defaults.minimumStock;
+				self.db.profile.defaults.minimumStock = nil;
+			end
+			if self.db.profile.defaults.minimumLocalStock then
+				print("Renaming the minimum local stock property...");
+				-- We added another stock option and then renamed it
+				self.db.profile.defaults.minLocalStock = self.db.profile.defaults.minimumLocalStock;
+				self.db.profile.defaults.minimumLocalStock = nil;
+			end
+			if self.db.profile.defaults.alertBelowMinimum then
+				print("Copying the alert below minimum value into the alert below global minimum value...");
+				-- We added another stock option and then renamed it
+				self.db.profile.defaults.alertBelowGlobalMinimum = self.db.profile.defaults.alertBelowMinimum;
+				self.db.profile.defaults.alertBelowMinimum = nil;
+			end
+			-- Go through all groups to see if there's one with the above two renamed variables
+			for groupName, values in pairs(self.db.profile.groups) do
+				if values.minimumStock then
+					values.minGlobalStock = values.minimumStock;
+					values.minimumStock = nil;
+				end
+			end
+		end
+		-- Remember the version of our database
+		self.db.global.version = addonRevision;
+	end
 	-- SLASH COMMANDS
 	-- Disable the AddonLoader slash commands
 	SLASH_INVENTORIUM1 = nil;
 	SLASH_IY1 = nil;
 	-- Register our own slash commands
 	SLASH_INVENTORIUM1 = "/inventorium";
 	SLASH_INVENTORIUM2 = "/im";
-	SlashCmdList["INVENTORIUM"] = InventoriumCommandHandler;
+	SlashCmdList["INVENTORIUM"] = CommandHandler;
 	-- Config command handling
 	self:RegisterSlash(function(this)
 		-- We don't want any other windows open at this time.
 		for name, module in this:IterateModules() do
 	local playerName = UnitName("player");
 	if not self.db.factionrealm.characters[playerName] then
 		self.db.factionrealm.characters[playerName] = true;
 		-- Default to tracking on all chars, untracking is a convenience, not tracking by default would probably get multiple issue reports.
-		self.db.global.defaults.trackAtCharacters[playerName] = true;
+		self.db.profile.defaults.trackAtCharacters[playerName] = true;
 	end
 	self:PremadeGroupsCheck();
+end
+function addon:RefreshConfig()
+	self:FillGroupOptions();
 end
 local function InGroup(itemId)
 	-- Go through all groups to see if this item is already somewhere
-	for groupName, values in pairs(addon.db.global.groups) do
+	for groupName, values in pairs(addon.db.profile.groups) do
 		if values.items and values.items[itemId] then
 			return groupName;
 		end
 	end
 local function AddToGroup(groupName, itemId)
 	if InGroup(itemId) then
 		return false;
 	end
-	if not addon.db.global.groups[groupName].items then
+	if not addon.db.profile.groups[groupName].items then
-		addon.db.global.groups[groupName].items = {};
+		addon.db.profile.groups[groupName].items = {};
 	end
 	-- Set this item
-	addon.db.global.groups[groupName].items[itemId] = true;
+	addon.db.profile.groups[groupName].items[itemId] = true;
 	if AceConfigRegistry then
 		-- Now rebuild the list
 		AceConfigRegistry:NotifyChange("InventoriumOptions");
 	end
 	return true;
 	if InGroup(itemId) ~= groupName then
 		return false;
 	end
 	-- Unset this item
-	addon.db.global.groups[groupName].items[itemId] = nil;
+	addon.db.profile.groups[groupName].items[itemId] = nil;
 	return true;
 end
 function addon:PremadeGroupsCheck(updateGroupName, updateKey, accept)
 	-- Compare the current premade groups with those used, notify about changes
 	if addon.defaultGroups then
 		for premadeGroupName, groupInfo in pairs(addon.defaultGroups) do
 			-- Go through all default groups
-			for groupName, values in pairs(addon.db.global.groups) do
+			for groupName, values in pairs(addon.db.profile.groups) do
 				-- Go through all groups to find those with this premade group
 				if values.premadeGroups and values.premadeGroups[premadeGroupName] and values.premadeGroups[premadeGroupName] < groupInfo.version then
 					-- Outdated group
 	end
 	AceGUI:RegisterWidgetType(widgetType, GetItemLinkButton, widgetVersion);
 end
-local slashArgs = {};
-local slashError = "Wrong argument, the following arguements are available:";
 function addon:RegisterSlash(func, args, description)
 	for _, arg in pairs(args) do
 		slashArgs[arg] = func;
 	end
 	if description then
 		slashError = slashError .. "\n" .. description;
-	end
-end
-function InventoriumCommandHandler(message)
-	local cmd, arg = string.split(" ", (message or ""), 2);
-	cmd = string.lower(cmd);
-	if slashArgs[cmd] then
-		slashArgs[cmd](addon, arg);
-	else
-		print(slashError);
 	end
 end
 function addon:Load()
 	if not AceConfigDialog and not AceConfigRegistry then
 						type = "description",
 						name = function()
 							local t = "Here you can set general settings. The settings entered here will be used when you choose not to override the settings within an individual group.\n\n";
 							local currentAddon, selectedAddonName = addon:GetItemCountAddon();
-							local preferedAddon = self.db.global.defaults.itemCountAddon;
+							local preferedAddon = self.db.profile.defaults.itemCountAddon;
 							if currentAddon then
 								--GetCharacterCount
 								--self.supportedAddons.itemCount[selectedExternalAddon]
 								t = t .. "Currently using |cfffed000" .. selectedAddonName .. "|r as your item count addon. This addon is " .. ((currentAddon.IsEnabled() and "|cff00ff00enabled|r") or "|cffff0000disabled|r") .. ".";
 								temp[name] = name;
 							end
 							return temp;
 						end,
-						get = function() return self.db.global.defaults.auctionPricingAddon; end,
+						get = function() return self.db.profile.defaults.auctionPricingAddon; end,
 						set = function(i, v)
-							self.db.global.defaults.auctionPricingAddon = v;
+							self.db.profile.defaults.auctionPricingAddon = v;
 							if self.supportedAddons.auctionPricing[v].OnSelect then
 								self.supportedAddons.auctionPricing[v].OnSelect();
 							end
 						end,
 								temp[name] = name;
 							end
 							return temp;
 						end,
-						get = function() return self.db.global.defaults.itemCountAddon; end,
+						get = function() return self.db.profile.defaults.itemCountAddon; end,
 						set = function(i, v)
-							self.db.global.defaults.itemCountAddon = v;
+							self.db.profile.defaults.itemCountAddon = v;
 							if self.supportedAddons.itemCount[v].OnSelect then
 								self.supportedAddons.itemCount[v].OnSelect();
 							end
 						end,
 								temp[name] = name;
 							end
 							return temp;
 						end,
-						get = function() return self.db.global.defaults.craftingAddon; end,
+						get = function() return self.db.profile.defaults.craftingAddon; end,
 						set = function(i, v)
-							self.db.global.defaults.craftingAddon = v;
+							self.db.profile.defaults.craftingAddon = v;
 							if self.supportedAddons.crafting[v].OnSelect then
 								self.supportedAddons.crafting[v].OnSelect();
 							end
 						end,
 							["Bag"] = "Bag",
 							["Bank"] = "Bank",
 							["Auction House"] = "Auction House",
 							["Mailbox"] = "Mailbox",
 						},
-						get = function(i, v) return self.db.global.defaults.localItemData and self.db.global.defaults.localItemData[v]; end,
+						get = function(i, v) return self.db.profile.defaults.localItemData and self.db.profile.defaults.localItemData[v]; end,
-						set = function(i, v, e) self.db.global.defaults.localItemData[v] = e or nil; end,
+						set = function(i, v, e) self.db.profile.defaults.localItemData[v] = e or nil; end,
 						--dialogControl = "Dropdown", -- this is not standard, normal multiselect control gives us a list of all chars with toggle-boxes. UGLY! We want a multiselect-box instead.
 					},
 				},
 			},
 			minimumStock = {
 						max = 100000,
 						softMax = 100,
 						step = 1,
 						name = "Minimum local stock",
 						desc = "You can manually enter a value between 100 and 100.000 in the text box below if the provided range is insufficient.",
-						get = function() return self.db.global.defaults.minimumLocalStock; end,
+						get = function() return self.db.profile.defaults.minLocalStock; end,
-						set = function(i, v) self.db.global.defaults.minimumLocalStock = v; end,
+						set = function(i, v) self.db.profile.defaults.minLocalStock = v; end,
 					},
 					alertBelowLocalMinimum = {
 						order = 11,
 						type = "toggle",
 						name = "Alert when below local minimum (NYI)",
 						desc = "Show an alert when this item gets below this threshold.",
-						get = function() return self.db.global.defaults.alertBelowLocalMinimum; end,
+						get = function() return self.db.profile.defaults.alertBelowLocalMinimum; end,
-						set = function(i, v) self.db.global.defaults.alertBelowLocalMinimum = v; end,
+						set = function(i, v) self.db.profile.defaults.alertBelowLocalMinimum = v; end,
 					},
 					minGlobalStock = {
 						order = 20,
 						type = "range",
 						min = 0,
 						max = 100000,
 						softMax = 100,
 						step = 1,
 						name = "Minimum global stock",
 						desc = "You can manually enter a value between 100 and 100.000 in the text box below if the provided range is insufficient.",
-						get = function() return self.db.global.defaults.minimumStock; end,
+						get = function() return self.db.profile.defaults.minGlobalStock; end,
-						set = function(i, v) self.db.global.defaults.minimumStock = v; end,
+						set = function(i, v) self.db.profile.defaults.minGlobalStock = v; end,
 					},
 					alertBelowGlobalMinimum = {
 						order = 21,
 						type = "toggle",
 						name = "Alert when below global minimum (NYI)",
 						desc = "Show an alert when this item gets below this threshold.",
-						get = function() return self.db.global.defaults.alertBelowMinimum; end,
+						get = function() return self.db.profile.defaults.alertBelowGlobalMinimum; end,
-						set = function(i, v) self.db.global.defaults.alertBelowMinimum = v; end,
+						set = function(i, v) self.db.profile.defaults.alertBelowGlobalMinimum = v; end,
 					},
 					summaryThresholdShow = {
 						order = 30,
 						type = "range",
 						min = 0,
 						softMax = 100,
 						step = 0.05,
 						isPercent = true,
 						name = "Show in summary when below",
 						desc = "Show items in the summary when below this percentage of the minimum stock. This can be either below the minimum or the global stock.\n\nYou can manually enter a value between 1.000% and 10.000% in the edit box if the provided range is insufficient.",
-						get = function() return self.db.global.defaults.summaryThresholdShow; end,
+						get = function() return self.db.profile.defaults.summaryThresholdShow; end,
-						set = function(i, v) self.db.global.defaults.summaryThresholdShow = v; end,
+						set = function(i, v) self.db.profile.defaults.summaryThresholdShow = v; end,
 					},
 					trackAtCharacters = {
 						order = 40,
 						type = "multiselect",
 						name = "Track at",
 								temp[charName] = charName;
 							end
 							return temp;
 						end,
-						get = function(i, v) return self.db.global.defaults.trackAtCharacters[v]; end,
+						get = function(i, v) return self.db.profile.defaults.trackAtCharacters[v]; end,
-						set = function(i, v, e) self.db.global.defaults.trackAtCharacters[v] = e or nil; end,
+						set = function(i, v, e) self.db.profile.defaults.trackAtCharacters[v] = e or nil; end,
 						--dialogControl = "Dropdown", -- this is not standard, normal multiselect control gives us a list of all chars with toggle-boxes. UGLY! We want a multiselect-box instead.
 					},
 				},
 			},
 			refill = {
 						order = 0,
 						type = "description",
 						name = function()
 							local r = "Here you can specify the default amount of items to which you wish to restock when you are collecting new items. This may be higher than the minimum stock. The settings entered here will be used when you choose not to override the settings within an individual group.\n\n";
-							r = r .. "When restocking the target amount is |cfffed000" .. self.db.global.defaults.restockTarget .. "|r of every item. Not queueing craftable items when only missing |cfffed000" .. floor( self.db.global.defaults.minCraftingQueue * self.db.global.defaults.restockTarget ) .. "|r (|cfffed000" .. ( self.db.global.defaults.minCraftingQueue * 100 ) .. "%|r) of the restock target.";
+							r = r .. "When restocking the target amount is |cfffed000" .. self.db.profile.defaults.restockTarget .. "|r of every item. Not queueing craftable items when only missing |cfffed000" .. floor( self.db.profile.defaults.minCraftingQueue * self.db.profile.defaults.restockTarget ) .. "|r (|cfffed000" .. ( self.db.profile.defaults.minCraftingQueue * 100 ) .. "%|r) of the restock target.";
 							return r;
 						end,
 					},
 					header = {
 						max = 100000,
 						softMax = 100,
 						step = 1,
 						name = "Restock target",
 						desc = "You can manually enter a value between 100 and 100.000 in the edit box if the provided range is insufficient.",
-						get = function() return self.db.global.defaults.restockTarget; end,
+						get = function() return self.db.profile.defaults.restockTarget; end,
-						set = function(i, v) self.db.global.defaults.restockTarget = v; end,
+						set = function(i, v) self.db.profile.defaults.restockTarget = v; end,
 					},
 					minCraftingQueue = {
 						order = 20,
 						type = "range",
 						min = 0,
 						max = 1,
 						step = 0.01, -- 1%
 						isPercent = true,
 						name = "Don't queue if I only miss",
 						desc = "Don't add a craftable item to the queue if I only miss this much or less of the restock target.\n\nExample: if your restock target is set to 60 and this is set to 5%, an item won't be queued unless you are missing more than 3 of it.",
-						get = function() return self.db.global.defaults.minCraftingQueue; end,
+						get = function() return self.db.profile.defaults.minCraftingQueue; end,
-						set = function(i, v) self.db.global.defaults.minCraftingQueue = v; end,
+						set = function(i, v) self.db.profile.defaults.minCraftingQueue = v; end,
 					},
 					bonusQueue = {
 						order = 30,
 						type = "range",
 						min = 0,
 						max = 10, -- 1000%
 						step = 0.01, -- 1%
 						isPercent = true,
 						name = "Bonus queue",
 						desc = "Get additional items when there are none left.\n\nExample: if your restock target is set to 60 and this is set to 10%, you will get 66 items instead of just 60 if you end up with none left while queueing.",
-						get = function() return self.db.global.defaults.bonusQueue; end,
+						get = function() return self.db.profile.defaults.bonusQueue; end,
-						set = function(i, v) self.db.global.defaults.bonusQueue = v; end,
+						set = function(i, v) self.db.profile.defaults.bonusQueue = v; end,
 					},
 					priceThreshold = {
 						order = 40,
 						type = "input",
 						name = "Price threshold",
 						desc = "Only queue craftable items when they are worth at least this much according to your auction house addon.\n\nSet to 0 to ignore auction prices.",
 						validate = function(info, value) return self:ValidateReadableMoney(info, value); end,
-						get = function() return self:ReadableMoney(self.db.global.defaults.priceThreshold); end,
+						get = function() return self:ReadableMoney(self.db.profile.defaults.priceThreshold); end,
-						set = function(i, v) self.db.global.defaults.priceThreshold = self:ReadableMoneyToCopper(v); end,
+						set = function(i, v) self.db.profile.defaults.priceThreshold = self:ReadableMoneyToCopper(v); end,
 					},
 					summaryHidePriceThreshold = {
 						order = 50,
 						type = "toggle",
 						name = "Hide when below threshold",
 						desc = "Hide items from the summary when their value is below the set price threshold.",
-						get = function() return self.db.global.defaults.summaryHidePriceThreshold; end,
+						get = function() return self.db.profile.defaults.summaryHidePriceThreshold; end,
-						set = function(i, v) self.db.global.defaults.summaryHidePriceThreshold = v; end,
+						set = function(i, v) self.db.profile.defaults.summaryHidePriceThreshold = v; end,
 					},
 					alwaysGetAuctionValue = {
 						order = 60,
 						type = "toggle",
 						name = "Always show auction value",
 						desc = "Always cache and show the auction value of items, even if the price threshold is set to 0|cffeda55fc|r.",
-						get = function() return self.db.global.defaults.alwaysGetAuctionValue; end,
+						get = function() return self.db.profile.defaults.alwaysGetAuctionValue; end,
-						set = function(i, v) self.db.global.defaults.alwaysGetAuctionValue = v; end,
+						set = function(i, v) self.db.profile.defaults.alwaysGetAuctionValue = v; end,
 					},
 				},
 			},
 			colorCodes = {
 				order = 30,
 						max = 1,
 						step = 0.01,
 						isPercent = true,
 						name = "|cff00ff00Green|r",
 						desc = "Show quantity in green when at least this much of the minimum stock is available.",
-						get = function() return self.db.global.defaults.colors.green; end,
+						get = function() return self.db.profile.defaults.colors.green; end,
-						set = function(i, v) self.db.global.defaults.colors.green = v; end,
+						set = function(i, v) self.db.profile.defaults.colors.green = v; end,
 					},
 					yellow = {
 						order = 20,
 						type = "range",
 						min = 0,
 						max = 1,
 						step = 0.01,
 						isPercent = true,
 						name = "|cffffff00Yellow|r",
 						desc = "Show quantity in yellow when at least this much of the minimum stock is available.",
-						get = function() return self.db.global.defaults.colors.yellow; end,
+						get = function() return self.db.profile.defaults.colors.yellow; end,
-						set = function(i, v) self.db.global.defaults.colors.yellow = v; end,
+						set = function(i, v) self.db.profile.defaults.colors.yellow = v; end,
 					},
 					orange = {
 						order = 30,
 						type = "range",
 						min = 0,
 						max = 1,
 						step = 0.01,
 						isPercent = true,
 						name = "|cffff9933Orange|r",
 						desc = "Show quantity in orange when at least this much of the minimum stock is available.",
-						get = function() return self.db.global.defaults.colors.orange; end,
+						get = function() return self.db.profile.defaults.colors.orange; end,
-						set = function(i, v) self.db.global.defaults.colors.orange = v; end,
+						set = function(i, v) self.db.profile.defaults.colors.orange = v; end,
 					},
 					red = {
 						order = 40,
 						type = "range",
 						min = 0,
 						max = 1,
 						step = 0.01,
 						isPercent = true,
 						name = "|cffff0000Red|r",
 						desc = "Show quantity in red when at least this much of the minimum stock is available.",
-						get = function() return self.db.global.defaults.colors.red; end,
+						get = function() return self.db.profile.defaults.colors.red; end,
-						set = function(i, v) self.db.global.defaults.colors.red = v; end,
+						set = function(i, v) self.db.profile.defaults.colors.red = v; end,
 					},
 				},
 			},
 		},
 	};
 			-- If this override was disabled and a saved variable name was provided, set it to nil rather than false
 			value = nil;
 			-- If this is an override toggler then also set the related field to nil
-			addon.db.global.groups[groupName][info.arg] = nil;
+			addon.db.profile.groups[groupName][info.arg] = nil;
 		elseif value and info.arg then
 			-- If this override is now enabled, we need to copy the default into this field (unless it is not nil (which is supposed to be impossible), in which case we'll use the already selected value)
-			addon.db.global.groups[groupName][info.arg] = addon:GetOptionByKey(groupName, info.arg);
+			addon.db.profile.groups[groupName][info.arg] = addon:GetOptionByKey(groupName, info.arg);
 		end
 	end
 	if multiSelectEnabled ~= nil then
 		-- The saved vars for a multiselect will always be an array, it may not yet exist in which case it must be created.
-		if not addon.db.global.groups[groupName][optionName] then
+		if not addon.db.profile.groups[groupName][optionName] then
-			addon.db.global.groups[groupName][optionName] = {};
+			addon.db.profile.groups[groupName][optionName] = {};
 		end
-		addon.db.global.groups[groupName][optionName][value] = multiSelectEnabled or nil;
+		addon.db.profile.groups[groupName][optionName][value] = multiSelectEnabled or nil;
 	else
-		addon.db.global.groups[groupName][optionName] = value;
+		addon.db.profile.groups[groupName][optionName] = value;
 	end
 end
 function addon:GetOptionByKey(groupName, optionName, noDefault)
-	if groupName and self.db.global.groups[groupName] and self.db.global.groups[groupName][optionName] ~= nil then
+	if groupName and self.db.profile.groups[groupName] and self.db.profile.groups[groupName][optionName] ~= nil then
 		-- If this option exists within the settings of this group
-		return self.db.global.groups[groupName][optionName];
+		return self.db.profile.groups[groupName][optionName];
-	elseif groupName and self.db.global.groups[groupName] and self.db.global.groups[groupName].virtualGroup ~= "" and not noDefault then
+	elseif groupName and self.db.profile.groups[groupName] and self.db.profile.groups[groupName].virtualGroup ~= "" and not noDefault then
 		-- If a virtual group was selected
-		return self:GetOptionByKey(self.db.global.groups[groupName].virtualGroup, optionName, noDefault);
+		return self:GetOptionByKey(self.db.profile.groups[groupName].virtualGroup, optionName, noDefault);
-	elseif self.db.global.defaults[optionName] and not noDefault then
+	elseif self.db.profile.defaults[optionName] and not noDefault then
-		return self.db.global.defaults[optionName];
+		return self.db.profile.defaults[optionName];
 	else
 		return nil;
 	end
 end
 local function GetMultiOption(info, value)
 	local groupName = groupIdToName[info[2]];
 	local optionName = info[#info];
-	if addon.db.global.groups[groupName][optionName] ~= nil then
+	if addon.db.profile.groups[groupName][optionName] ~= nil then
-		return addon.db.global.groups[groupName][optionName][value];
+		return addon.db.profile.groups[groupName][optionName][value];
-	elseif addon.db.global.defaults[optionName] then
+	elseif addon.db.profile.defaults[optionName] then
-		return addon.db.global.defaults[optionName][value];
+		return addon.db.profile.defaults[optionName][value];
 	else
 		return nil;
 	end
 end
 end
 local function ValidateGroupName(_, value)
 	value = string.lower(string.trim(value or ""));
-	for name, _ in pairs(addon.db.global.groups) do
+	for name, _ in pairs(addon.db.profile.groups) do
 		if string.lower(name) == value then
 			return ("A group named \"%s\" already exists."):format(name);
 		end
 	end
 };
 local function UpdateAddItemList(info)
 	local groupName = groupIdToName[info[2]];
-	if not addon.db.global.groups[groupName].items then
+	if not addon.db.profile.groups[groupName].items then
-		addon.db.global.groups[groupName].items = {};
+		addon.db.profile.groups[groupName].items = {};
 	end
 	-- Merge all items from all groups together
 	local items = {};
-	for groupName, values in pairs(addon.db.global.groups) do
+	for groupName, values in pairs(addon.db.profile.groups) do
 		if values.items then
 			for itemId, _ in pairs(values.items) do
 				items[itemId] = true;
 			end
 		end
 end
 local function UpdateRemoveItemList(info)
 	local groupName = groupIdToName[info[2]];
-	if not addon.db.global.groups[groupName].items then
+	if not addon.db.profile.groups[groupName].items then
-		addon.db.global.groups[groupName].items = {};
+		addon.db.profile.groups[groupName].items = {};
 	end
 	local ref = options.args.groups.args[info[2]].args.remove.args.list.args;
 	-- Unset all
 	for itemId, _ in pairs(ref) do
 		ref[itemId] = nil;
 	end
 	-- Parse items in group and show these
-	for itemId, _ in pairs(addon.db.global.groups[groupName].items) do
+	for itemId, _ in pairs(addon.db.profile.groups[groupName].items) do
 		ref[itemId] = tblRemoveItemTemplate;
 	end
 end
 function addon:GetItemId(itemLink)
 							end,
 							set = function(info, value)
 								local groupName = groupIdToName[info[2]];
 								local optionName = info[#info];
-								addon.db.global.groups[groupName][optionName] = value ~= "" and value;
+								addon.db.profile.groups[groupName][optionName] = value ~= "" and value;
 								if addon.supportedAddons.auctionPricing[value].OnSelect then
 									addon.supportedAddons.auctionPricing[value].OnSelect();
 								end
 							end,
 							end,
 							set = function(info, value)
 								local groupName = groupIdToName[info[2]];
 								local optionName = info[#info];
-								addon.db.global.groups[groupName][optionName] = value ~= "" and value;
+								addon.db.profile.groups[groupName][optionName] = value ~= "" and value;
 								if addon.supportedAddons.itemCount[value].OnSelect then
 									addon.supportedAddons.itemCount[value].OnSelect();
 								end
 							end,
 							end,
 							set = function(info, value)
 								local groupName = groupIdToName[info[2]];
 								local optionName = info[#info];
-								addon.db.global.groups[groupName][optionName] = value ~= "" and value;
+								addon.db.profile.groups[groupName][optionName] = value ~= "" and value;
 								if addon.supportedAddons.crafting[value].OnSelect then
 									addon.supportedAddons.crafting[value].OnSelect();
 								end
 							end,
 								local groupName = groupIdToName[info[2]];
 								local temp = {};
 								temp[""] = "";
-								for name, values in pairs(addon.db.global.groups) do
+								for name, values in pairs(addon.db.profile.groups) do
 									if values.isVirtual and name ~= groupName then
 										temp[name] = name;
 									end
 								end
 							end,
 							set = function(info, value)
 								local groupName = groupIdToName[info[2]];
 								local optionName = info[#info];
-								addon.db.global.groups[groupName][optionName] = value ~= "" and value;
+								addon.db.profile.groups[groupName][optionName] = value ~= "" and value;
 							end,
 							disabled = false,
 						},
 					},
 				},
 							desc = "Change the name of this group to something else. You can also use item links here as you wish.",
 							validate = ValidateGroupName,
 							set = function(info, value)
 								local oldGroupName = groupIdToName[info[2]];
-								addon.db.global.groups[value] = CopyTable(addon.db.global.groups[oldGroupName]);
+								addon.db.profile.groups[value] = CopyTable(addon.db.profile.groups[oldGroupName]);
-								addon.db.global.groups[oldGroupName] = nil;
+								addon.db.profile.groups[oldGroupName] = nil;
 								groupIdToName[info[2]] = value;
 								groupIdToName[value] = true;
 								groupIdToName[oldGroupName] = nil;
 							desc = "Duplicate this group. You can also use item links here as you wish.\n\nAll item data will be erased.",
 							validate = ValidateGroupName,
 							set = function(info, value)
 								local oldGroupName = groupIdToName[info[2]];
-								addon.db.global.groups[value] = CopyTable(addon.db.global.groups[oldGroupName]);
+								addon.db.profile.groups[value] = CopyTable(addon.db.profile.groups[oldGroupName]);
 								-- Reset item data (duplicate items me no want)
-								addon.db.global.groups[value].items = nil;
+								addon.db.profile.groups[value].items = nil;
 								addon:FillGroupOptions();
 							end,
 							get = false,
 						},
 							confirm = true,
 							confirmText = "Are you sure you wish to |cffff0000DELETE|r this group? This action is not reversable!",
 							func = function(info)
 								local groupName = groupIdToName[info[2]];
-								addon.db.global.groups[groupName] = nil;
+								addon.db.profile.groups[groupName] = nil;
 								addon:FillGroupOptions();
 							end,
 						},
 					},
 							set = false,
 							get = function(info)
 								local groupName = groupIdToName[info[2]];
 								-- We want to include the group name, so we copy the table then set another value
-								local temp = CopyTable(addon.db.global.groups[groupName]);
+								local temp = CopyTable(addon.db.profile.groups[groupName]);
 								temp.name = groupName;
 								temp.trackAtCharacters = nil;
 								temp.overrideTrackAtCharacters = nil;
 								if not AceSerializer then
 								local groupName = groupIdToName[info[2]];
 								print(("Importing items from the premade group \"|cfffed000%s|r\"."):format(value));
 								-- Remember we imported this group and it's version so if it is ever changed, people can be notified
-								if not addon.db.global.groups[groupName].premadeGroups then
+								if not addon.db.profile.groups[groupName].premadeGroups then
-									addon.db.global.groups[groupName].premadeGroups = {};
+									addon.db.profile.groups[groupName].premadeGroups = {};
 								end
-								addon.db.global.groups[groupName].premadeGroups[value] = addon.defaultGroups[value].version;
+								addon.db.profile.groups[groupName].premadeGroups[value] = addon.defaultGroups[value].version;
 								for itemId, version in pairs(addon.defaultGroups[value].items) do
 									if version > 0 then
 										itemId = itemId and tonumber(itemId);
 							desc = "This is a list of all premade groups that were imported into this group. You will be notified when any of these premade groups have changed and you will be able to import these changes.\n\nSelect a group to stop reminding you of changes to the premade group (the item list will be unaffected). Doing so will require you to manually update this when new items are added to the game.",
 							values = function(info)
 						    	local groupName = groupIdToName[info[2]];
 						    	local temp = {};
-						    	if addon.db.global.groups[groupName].premadeGroups then
+						    	if addon.db.profile.groups[groupName].premadeGroups then
-							    	for name, version in pairs(addon.db.global.groups[groupName].premadeGroups) do
+							    	for name, version in pairs(addon.db.profile.groups[groupName].premadeGroups) do
 							    		temp[name] = name;
 							    	end
 						    	end
 						    	return temp;
 							end,
 							set = function(info, value)
 								-- Remove premade group from this group
 						    	local groupName = groupIdToName[info[2]];
-						    	addon.db.global.groups[groupName].premadeGroups[value] = nil;
+						    	addon.db.profile.groups[groupName].premadeGroups[value] = nil;
 						    	print(("No longer notifying you about changes made to the premade group named \"|cfffed000%s|r\"."):format(value));
 							end,
 							get = false,
 							disabled = function(info)
 						    	local groupName = groupIdToName[info[2]];
-								return (not addon.db.global.groups[groupName].premadeGroups);
+								return (not addon.db.profile.groups[groupName].premadeGroups);
 							end,
 						},
 					},
 				},
 				list = {
 							get = function(info)
 								local groupName = groupIdToName[info[2]];
 								local combinedItemIds;
 								-- Parse items in group and show these
-								for itemId, _ in pairs(addon.db.global.groups[groupName].items) do
+								for itemId, _ in pairs(addon.db.profile.groups[groupName].items) do
 									if not combinedItemIds then
 										combinedItemIds = tostring(itemId);
 									else
 										combinedItemIds = combinedItemIds .. (";%d"):format(itemId);
 									end
 						type = "input",
 						name = "Group name",
 						desc = "The name of the group. You can also use item links as you wish.",
 						validate = ValidateGroupName,
 						set = function(_, value)
-							self.db.global.groups[value] = {};
+							self.db.profile.groups[value] = {};
 							if currentGroupType == "Virtual" then
-								self.db.global.groups[value].isVirtual = true;
+								self.db.profile.groups[value].isVirtual = true;
 							end
 							addon:FillGroupOptions();
 						end,
 						get = false,
 								else
 									local name = temp.name;
 									temp.name = nil;
 									print(("Importing %s..."):format(name));
-									-- Remove items that are already in another group
+									if temp.items then
-									for value, _ in pairs(temp.items) do
+										-- Remove items that are already in another group
-										local itemId = tonumber(value);
+										for value, _ in pairs(temp.items) do
+											local itemId = tonumber(value);
-										if not itemId then
-											print(("\"%s\" is not a number."):format(value));
+											if not itemId then
-											temp.items[value] = nil;
+												print(("\"%s\" is not a number."):format(value));
-										elseif InGroup(itemId) then
+												temp.items[value] = nil;
-											print(("Skipping %s (#%d) as it is already in the group |cfffed000%s|r."):format(select(2, GetItemInfo(itemId)) or "Unknown", itemId, InGroup(itemId)));
+											elseif InGroup(itemId) then
-											temp.items[value] = nil;
+												print(("Skipping %s (#%d) as it is already in the group |cfffed000%s|r."):format(select(2, GetItemInfo(itemId)) or "Unknown", itemId, InGroup(itemId)));
-										else
+												temp.items[value] = nil;
-											-- Ensure the keys are numeric
+											else
-											temp.items[value] = nil;
+												-- Ensure the keys are numeric
-											temp.items[itemId] = true;
+												temp.items[value] = nil;
+												temp.items[itemId] = true;
+											end
 										end
 									end
 									-- Ensure this data isn't received (this would be silly/buggy as exports from other accounts - with different characters - won't know what to do with this)
 									temp.trackAtCharacters = nil;
 									temp.overrideTrackAtCharacters = nil;
-									self.db.global.groups[name] = temp;
+									self.db.profile.groups[name] = temp;
 								end
 							end
 							self:FillGroupOptions();
 						end,
 	};
 end
 function addon:FillGroupOptions()
 	for id, name in pairs(groupIdToName) do
-		if type(name) == "string" and not self.db.global.groups[name] then
+		if type(name) == "string" and not self.db.profile.groups[name] then
 			options.args.groups.args[id] = nil;
 			groupIdToName[id] = nil;
 			groupIdToName[name] = nil;
 			groupIsVirtual[id] = nil;
 		end
 	end
-	for name, values in pairs(self.db.global.groups) do
+	for name, values in pairs(self.db.profile.groups) do
 		if not groupIdToName[name] then
 			options.args.groups.args[tostring(count)] = defaultGroup;
 			groupIdToName[tostring(count)] = name;
 			groupIdToName[name] = true;

Mercurial > wow > inventory

comparison Core.lua @ 61:d903b0a151d3