wow/askmrrobot: Import.lua comparison

comparison Import.lua @ 161:35612aee8e15

Added junk list.

author	yellowfive
date	Mon, 06 May 2019 14:08:03 -0700
parents	cc82eeeec1c8
children	f27a7c64b21f

comparison

equal deleted inserted replaced

-:d670336e8c89
+:35612aee8e15
 local function onTextEnterPressed(widget)
 	-- hide the overwolf cover when import data is received
 	if _panelCover then
 		_panelCover:SetVisible(false)
 	end
-	-- do an import if the data starts and ends with a dollar sign
+	-- do an import if the data starts with a dollar sign
-	local txt = _txtImport:GetText()
+local txt = _txtImport:GetText()
 	local txtLen = string.len(txt)
-	if txtLen > 2 and string.sub(txt, 1, 1) == '$' then
+if txtLen > 6 and (string.sub(txt, 1, 1) == '$' or string.sub(txt, 1, 5) == "_bib_" or string.sub(txt, 1, 6) == "_junk_") then
 		onImportOkClick()
 	end
 end
 ----------------------------------------------------------------------------
 -- Import Parsing
 ----------------------------------------------------------------------------
 --
--- Import a character, returning nil on success, otherwise an error message, import result stored in the db.
+-- Helper to parse a list of items in the standard item list format.
 --
-function Amr:ImportCharacter(data, isTest, isChild)
+local function parseItemList(parts, startPos, endToken, hasSlot)
--- make sure all data is up to date before importing and get a local copy of player's current state
-local currentPlayerData = self:ExportCharacter()
-if data == nil or string.len(data) == 0 then
-return L.ImportErrorEmpty
-end
-	-- if multiple setups are included in the data, parse each individually, then quit
-	local specParts = { strsplit("\n", data) }
-if #specParts > 1 then
--- clear out any previously-imported BiB setups when importing new ones (non-BiB will always be imported one at a time)
-for i = #Amr.db.char.GearSetups, 1, -1 do
-if Amr.db.char.GearSetups[i].IsBib then
-table.remove(Amr.db.char.GearSetups, i)
-end
-end
-for i = 1, #specParts do
-if specParts[i] ~= "_bib_" then
-local err = self:ImportCharacter(specParts[i], isTest, true)
-if err ~= nil then
-return err
-end
-end
-end
--- ensure that all BiB setups are sorted to the top
-local nonBib = {}
-for i = #Amr.db.char.GearSetups, 1, -1 do
-if not Amr.db.char.GearSetups[i].IsBib then
-table.insert(nonBib, Amr.db.char.GearSetups[i])
-table.remove(Amr.db.char.GearSetups, i)
-end
-end
-for i, setup in ipairs(nonBib) do
-table.insert(Amr.db.char.GearSetups, setup)
-end
-return
-	end
-local data1 = { strsplit("$", data) }
-if #data1 ~= 3 then
-return L.ImportErrorFormat
-end
-local parts = { strsplit(";", data1[2]) }
--- require a minimum version
-local ver = tonumber(parts[1])
-if ver < Amr.MIN_IMPORT_VERSION then
-return L.ImportErrorVersion
-end
--- require name match (don't match realm due to language issues for now)
-if not isTest then
-		local region = parts[2]
-local realm = parts[3]
-local name = parts[4]
-if name ~= currentPlayerData.Name then
-local importPlayerName = name .. " (" .. realm .. ")"
-local you = currentPlayerData.Name .. " (" .. currentPlayerData.Realm .. ")"
-return L.ImportErrorChar(importPlayerName, you)
-end
--- require race match
-local race = tonumber(parts[6])
-if race ~= Amr.RaceIds[currentPlayerData.Race] then
-return L.ImportErrorRace
-end
--- require faction match
-local faction = tonumber(parts[7])
-if faction ~= Amr.FactionIds[currentPlayerData.Faction] then
-return L.ImportErrorFaction
-end
--- require level match
-local level = tonumber(parts[8])
-if level ~= currentPlayerData.Level then
-return L.ImportErrorLevel
-end
-end
--- if we make it this far, the data is valid, so read item information
-	local specSlot = tonumber(parts[11])
 local importData = {}
-local enchantInfo = {}
 local prevItemId = 0
 local prevGemId = 0
 local prevEnchantId = 0
 local prevUpgradeId = 0
 local prevBonusId = 0
 ["6"] = true,
 ["7"] = true,
 ["8"] = true,
 ["9"] = true,
 }
-for i = 16, #parts do
+for i = startPos, #parts do
 local itemString = parts[i]
-if itemString ~= "" and itemString ~= "_" then
+if itemString == endToken then
+break
+elseif itemString ~= "" and itemString ~= "_" then
 local tokens = {}
 local bonusIds = {}
 local azerite = {}
 local hasBonuses = false
 local hasAzerites = false
 prop = c
 end
 end
 local obj = {}
-importData[tonumber(tokens["s"])] = obj
+if hasSlot then
+importData[tonumber(tokens["s"])] = obj
+else
+table.insert(importData, obj)
+end
 obj.id = tokens["i"]
 obj.suffixId = tokens["f"] or 0
 obj.upgradeId = tokens["u"] or 0
 			obj.level = tokens["v"] or 0
 obj.enchantId = tokens["e"] or 0
 if hasAzerites then
 obj.azerite = azerite
 end
 end
 end
+return importData
+end
+--
+-- Import a character, returning nil on success, otherwise an error message, import result stored in the db.
+--
+function Amr:ImportCharacter(data, isTest, isChild)
+-- make sure all data is up to date before importing and get a local copy of player's current state
+local currentPlayerData = self:ExportCharacter()
+if data == nil or string.len(data) == 0 then
+return L.ImportErrorEmpty
+end
+	-- if multiple setups are included in the data, parse each individually, then quit
+local specParts = { strsplit("\n", data) }
+if #specParts > 1 and specParts[1] == "_junk_" then
+-- if the string starts with "_junk_" then it is the junk list
+Amr:ImportJunkList(specParts[2], currentPlayerData)
+return
+elseif #specParts > 1 then
+-- clear out any previously-imported BiB setups when importing new ones (non-BiB will always be imported one at a time)
+for i = #Amr.db.char.GearSetups, 1, -1 do
+if Amr.db.char.GearSetups[i].IsBib then
+table.remove(Amr.db.char.GearSetups, i)
+end
+end
+for i = 1, #specParts do
+if specParts[i] ~= "_bib_" then
+local err = self:ImportCharacter(specParts[i], isTest, true)
+if err ~= nil then
+return err
+end
+end
+end
+-- ensure that all BiB setups are sorted to the top
+local nonBib = {}
+for i = #Amr.db.char.GearSetups, 1, -1 do
+if not Amr.db.char.GearSetups[i].IsBib then
+table.insert(nonBib, Amr.db.char.GearSetups[i])
+table.remove(Amr.db.char.GearSetups, i)
+end
+end
+for i, setup in ipairs(nonBib) do
+table.insert(Amr.db.char.GearSetups, setup)
+end
+return
+	end
+local data1 = { strsplit("$", data) }
+if #data1 ~= 3 then
+return L.ImportErrorFormat
+end
+local parts = { strsplit(";", data1[2]) }
+-- require a minimum version
+local ver = tonumber(parts[1])
+if ver < Amr.MIN_IMPORT_VERSION then
+return L.ImportErrorVersion
+end
+-- require name match (don't match realm due to language issues for now)
+if not isTest then
+		local region = parts[2]
+local realm = parts[3]
+local name = parts[4]
+if name ~= currentPlayerData.Name then
+local importPlayerName = name .. " (" .. realm .. ")"
+local you = currentPlayerData.Name .. " (" .. currentPlayerData.Realm .. ")"
+return L.ImportErrorChar(importPlayerName, you)
+end
+-- require race match
+local race = tonumber(parts[6])
+if race ~= Amr.RaceIds[currentPlayerData.Race] then
+return L.ImportErrorRace
+end
+-- require faction match
+local faction = tonumber(parts[7])
+if faction ~= Amr.FactionIds[currentPlayerData.Faction] then
+return L.ImportErrorFaction
+end
+-- require level match
+local level = tonumber(parts[8])
+if level ~= currentPlayerData.Level then
+return L.ImportErrorLevel
+end
+end
+-- if we make it this far, the data is valid, so read item information
+	local specSlot = tonumber(parts[11])
+local importData = parseItemList(parts, 16, "n/a", true)
 -- extra information contains setup id, display label, then extra enchant info
 parts = { strsplit("@", data1[3]) }
 local setupId = parts[2]
 local setupName = parts[3]
+local enchantInfo = {}
 for i = 4, #parts do
 local infoParts = { strsplit("\\", parts[i]) }
 if infoParts[1] == "e" then
 		-- also update shopping list after import
 		Amr:UpdateShoppingData(currentPlayerData)
 end
 end
+--
+-- Import a list of items that are junk.
+--
+function Amr:ImportJunkList(data, currentPlayerData)
+local data1 = { strsplit("$", data) }
+if #data1 ~= 3 then
+return L.ImportErrorFormat
+end
+local parts = { strsplit(";", data1[2]) }
+-- require a minimum version
+local ver = tonumber(parts[1])
+if ver < Amr.MIN_IMPORT_VERSION then
+return L.ImportErrorVersion
+end
+-- require name match
+local region = parts[2]
+local realm = parts[3]
+local name = parts[4]
+if name ~= currentPlayerData.Name then
+local importPlayerName = name .. " (" .. realm .. ")"
+local you = currentPlayerData.Name .. " (" .. currentPlayerData.Realm .. ")"
+return L.ImportErrorChar(importPlayerName, you)
+end
+local keepStartPos = 0
+local junkStartPos = 0
+for i = 5, #parts do
+local partString = parts[i]
+if partString == ".k" then
+keepStartPos = i + 1
+elseif partString == ".d" then
+junkStartPos = i + 1
+end
+end
+Amr.db.char.JunkData = {}
+-- Keep is a lookup by unique id
+local keep = parseItemList(parts, keepStartPos, ".d", false)
+Amr.db.char.JunkData.Keep = {}
+for i = 1, #keep do
+local uniqueId = Amr.GetItemUniqueId(keep[i])
+Amr.db.char.JunkData.Keep[uniqueId] = keep[i]
+end
+-- Junk is a simple list of items to discard, in the desired display order
+Amr.db.char.JunkData.Junk = parseItemList(parts, junkStartPos, "n/a", false)
+-- extra information contains extra enchant info
+if #data1 >= 3 then
+parts = { strsplit("@", data1[3]) }
+local enchantInfo = {}
+for i = 2, #parts do
+local infoParts = { strsplit("\\", parts[i]) }
+if infoParts[1] == "e" then
+local enchObj = {}
+enchObj.id = tonumber(infoParts[2])
+enchObj.itemId = tonumber(infoParts[3])
+enchObj.spellId = tonumber(infoParts[4])
+enchObj.text = string.gsub(infoParts[5], "_(%a+)_", function(s) return L.StatsShort[s] end)
+local mats = infoParts[6]
+if string.len(mats) > 0 then
+enchObj.materials = {}
+mats = { strsplit(",", mats) }
+for j = 1, #mats do
+local kv = { strsplit("=", mats[j]) }
+enchObj.materials[tonumber(kv[1])] = tonumber(kv[2])
+end
+end
+enchantInfo[enchObj.id] = enchObj
+end
+end
+for k,v in pairs(enchantInfo) do
+Amr.db.char.ExtraEnchantData[k] = v
+end
+end
+-- show the junk window after a successful junk import
+Amr:ShowJunkWindow()
+end

Mercurial > wow > askmrrobot

comparison Import.lua @ 161:35612aee8e15