From 5fe73663b99c297878fc428c40cf135aface7403 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel@tofvesson.se>
Date: Tue, 8 Oct 2024 19:29:54 +0200
Subject: [PATCH] Implement safe item transactions

---
 itemcontroller.lua | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/itemcontroller.lua b/itemcontroller.lua
index 26cb7fc..8854836 100644
--- a/itemcontroller.lua
+++ b/itemcontroller.lua
@@ -245,11 +245,14 @@ local PAGES = {
       end,
       function()
         print("Importing...")
-        for _,nodeStack in state.node:find(function(s) return not s:isEmpty() end) do
-          if not state.controller:insertStack(nodeStack) then
-            print("Couldn't find a free slot for: "..(nodeStack:getDisplayName() or nodeStack:getName() or "[EMPTY]"))
+        -- Safely handle transfers, priming computer for a full reset/rescan in case server stops mid-transaction
+        state:itemTransaction(function()
+          for _,nodeStack in state.node:find(function(s) return not s:isEmpty() end) do
+            if not state.controller:insertStack(nodeStack) then
+              print("Couldn't find a free slot for: "..(nodeStack:getDisplayName() or nodeStack:getName() or "[EMPTY]"))
+            end
           end
-        end
+        end)
       end
     )
     state.pageState[state.currentPage] = pageState
@@ -284,9 +287,18 @@ local CONTROLLER_STATE = {
   monitor = monitor,
   nextPage = "MAIN",
   exit = false,
-  pageState = {}
+  pageState = {},
+  lock = lock,
+  unlock = unlock,
+  isLocked = isLocked
 }
 
+function CONTROLLER_STATE:itemTransaction(transact)
+  self.lock()
+  transact()
+  self.unlock()
+end
+
 os.queueEvent("dummy_event")
 while not CONTROLLER_STATE.exit do
   updatePageRender(CONTROLLER_STATE, PAGES)