From 46c1e3f7e5996ae3cc9df20e030925b940d13bd3 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Mon, 18 May 2020 11:38:32 -0600 Subject: [PATCH] storage export perf fix --- milo/plugins/exportTask.lua | 44 ++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/milo/plugins/exportTask.lua b/milo/plugins/exportTask.lua index c80159e..c499c7f 100644 --- a/milo/plugins/exportTask.lua +++ b/milo/plugins/exportTask.lua @@ -18,6 +18,9 @@ function ExportTask:cycle(context) for node in context.storage:filterActive('machine', filter) do tasks:add(function() + + local slots + for _, entry in pairs(node.exports) do if not entry.filter then @@ -66,13 +69,42 @@ function ExportTask:cycle(context) end local function exportItems() + local function isPossible(key) + local filterItem = itemDB:get(key) + + if not node.adapter.__size then + node.adapter.__size = node.adapter.size() + end + + -- note that this does not guarantee a match - as + -- we don't have full meta of item in slot + for i = 1, node.adapter.__size do + local slot = slots[i] + if (not slot or slot.name == filterItem.name and + (entry.ignoreDamage or slot.damage == filterItem.damage) and + slot.count < filterItem.maxCount) then + + return true + end + end + end + for key in pairs(entry.filter) do - local items = Milo:getMatches(itemDB:splitKey(key), entry) - for _,item in pairs(items) do - if context.storage:export(node, nil, item.count, item) == 0 then - -- TODO: really shouldn't break here as there may be room in other slots - -- leaving for now for performance reasons - break + if not slots then + slots = node.adapter.list() + end + if isPossible(key) then + local items = Milo:getMatches(itemDB:splitKey(key), entry) + for _,item in pairs(items) do + if context.storage:export(node, nil, item.count, item) == 0 then + -- TODO: really shouldn't break here as there may be room in other slots + -- leaving for now for performance reasons + + break + else + -- refresh the slots + slots = nil + end end end end