Use rolling log file

itemcontroller.lua

@@ -3,7 +3,7 @@ local CACHE_FILE = "/.storage.cache"
 local LOCK_FILE = "/.storage.lock"
 local LOG_FILE_PATH = "latest.log"
 local Logger = Logging.firstLoad(
-  Logging.LogLevel.TRACE,
+  Logging.LogLevel.DEBUG,
   Logging.OUTPUTS.combine(
     Logging.OUTPUTS.file(LOG_FILE_PATH),
     Logging.OUTPUTS.stdout
@@ -84,133 +84,6 @@ local function loadState(fname, node)
   return controller
 end
 
-local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage, runImport)
-  local state = savedState or {}
-  state.tab = state.tab or 1
-
-  local pages = math.ceil(#groups / (hBudget - 1))
-
-  -- Tab controls
-  local btnPrev = Text:new{
-    text = " < ",
-    bgColor = state.tab == 1 and colors.black or colors.gray,
-    fgColor = state.tab == 1 and colors.red or colors.white,
-    onClick = function(e, x, y, s)
-      if state.tab > 1 then
-        state.tab = state.tab - 1
-        setPage(nil)
-      end
-      return true
-    end
-  }
-
-  local btnImport = Text:new{
-    text = "IMPORT",
-    bgColor = colors.gray,
-    fgColor = colors.white,
-    onClick = function(e, x, y, s)
-      runImport()
-      return true
-    end
-  }
-
-  local btnNext = Text:new{
-    text = " > ",
-    bgColor = state.tab == pages and colors.black or colors.gray,
-    fgColor = state.tab == pages and colors.red or colors.white,
-    onClick = function(e, x, y, s)
-      if state.tab < pages then
-        state.tab = state.tab + 1
-        setPage(nil)
-      end
-      return true
-    end
-  }
-
-  local padImport = Padding:new{
-    left = math.floor((wBudget - btnPrev:getWidth() - btnNext:getWidth() - btnImport:getWidth())/2),
-    element = btnImport
-  }
-
-  local padNext = Padding:new{
-    left = wBudget - btnPrev:getWidth() - padImport:getWidth() - btnNext:getWidth(),
-    element = btnNext
-  }
-
-  local tabLine = List:new{
-    [Children:getId()] = {
-      btnPrev,
-      padImport,
-      padNext
-    },
-    [Orientation:getId()] = Orientation.HORIZONTAL
-  }
-
-  local bgColors = {
-    colors.gray,
-    colors.black
-  }
-  local entryBudget = hBudget - tabLine:getHeight()
-  local entryStart = 1 + (state.tab - 1) * (entryBudget)
-  local entryEnd = math.min(state.tab * entryBudget, #groups)
-  local entries = {}
-
-  for i=entryStart,entryEnd do
-    local group = groups[i]
-    local text = group:getSimpleName()
-    local count = tostring(group:getItemCount())
-
-    -- Fit text inside of width budget
-    local countLen = #count
-    if countLen + 2 > wBudget then
-      error("Width budget is too small")
-    end
-
-    local textBudget = wBudget - 2 - countLen
-    if #text > textBudget then
-      -- Truncate to available budget
-      text = text:sub(1,textBudget)
-    end
-
-    local nbtColor = group:getNBT() and colors.cyan or nil
-
-    local textLabel = Text:new{ text = text, bgColor = bgColors[i % 2], fgColor = nbtColor }
-    local countLabel = Text:new{ text = count, bgColor = bgColors[i % 2] }
-    local paddedText = Padding:new{
-      left = 0,
-      right = wBudget - #count - #text,
-      top = 0,
-      bottom = 0,
-      bgColor = bgColors[i % 2],
-      element = textLabel
-    }
-
-    local list = List:new{
-      [Children:getId()] = {
-        paddedText,
-        countLabel
-      },
-      [Orientation:getId()] = Orientation.HORIZONTAL,
-      onClick = onClick and function(element, x, y, source)
-        return onClick(element, x, y, source, group)
-      end or nil
-    }
-    table.insert(entries, list)
-  end
-
-  local tabLinePad = Padding:new{
-    top = hBudget - (entryEnd - entryStart) - 1 - tabLine:getHeight(),
-    element = tabLine
-  }
-
-  table.insert(entries, tabLinePad)
-
-  return List:new{
-    [Children:getId()] = entries,
-    [Orientation:getId()] = Orientation.VERTICAL
-  }, state
-end
-
 local function updatePageRender(state, pages)
   if state.nextPage ~= nil then
     state.changingPage = state.nextPage ~= state.currentPage
@@ -572,7 +445,7 @@ local PAGES = {
     table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY })
 
     local keyboardList = Padding:new{ bgColor = colors.cyan, left = KEYBOARD_HPAD, right = KEYBOARD_HPAD, element = List:new{
-      [Orientation:getId()] = Orientation.Vertical,
+      [Orientation:getId()] = Orientation.VERTICAL,
       [Children:getId()] = keyboardLines.elements
     }}
 
@@ -580,10 +453,16 @@ local PAGES = {
       [Children:getId()] = {
         mainList,
         keyboardList
-      }
+      },
+      x = 1,
+      y = 1,
+      strict = true
     }
 
     local function reloadState()
+      screenContainer:setWidth(state.width)
+      screenContainer:setHeight(state.height)
+
       -- Enumerate inventory stats
       local emptyCount = 0
       pageState.stacks = ItemGroup.collectStacks(state.controller:find(function(stack)
@@ -638,7 +517,7 @@ local PAGES = {
 
 ---@diagnostic disable-next-line: redefined-local
       local keyboardWidth = keyboardList:getWidth()
-      keyboardList:setPos(math.floor((screenContainer:getWidth() - keyboardWidth) / 2), screenContainer:getHeight() - keyboardList:getHeight())
+      keyboardList:setPos(math.floor((screenContainer:getWidth() - keyboardWidth) / 2), screenContainer:getHeight() - keyboardList:getHeight() - bottomBarList:getHeight())
 
       local filterDisplayedText = #pageState.filter < keyboardWidth and pageState.filter or pageState.filter:sub(#pageState.filter - keyboardWidth + 1)
       local filterText = keyboardList:findById(ID_FILTER_DISPLAY)

logging.lua

@@ -283,12 +283,26 @@ end
 
 Logging.OUTPUTS = {}
 function Logging.OUTPUTS.file(name)
-  local file = fs.open(name, "w+")
-  return function(text)
+  local doWrite = function(file, text)
     file.write(text)
     file.write("\n")
     file.flush()
   end
+  local file = fs.open(name, "w+")
+  return function(text)
+    if not pcall(doWrite, file, text) then
+      local dRes, dRet = pcall(fs.delete, name)
+      if not dRes then
+        print("Error deleting logfile ("..name.."): "..tostring(dRet))
+      else
+        file = fs.open(name, "w+")
+        local wRes, wRet = pcall(doWrite, file, text)
+        if not wRes then
+          print("Error writing to logfile ("..name.."): "..tostring(wRet))
+        end
+      end
+    end
+  end
 end
 Logging.OUTPUTS.stdout = print