From 709845dd8d9ba4d2658f2ad1481b96b87637a990 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Fri, 23 Jul 2021 01:41:06 -0400
Subject: [PATCH] ENH use func lib

---
 core                  |  2 +-
 drawing/Memory.lua    | 18 ++++++++++--------
 drawing/Network.lua   | 16 ++++++++--------
 drawing/Processor.lua | 12 +++++-------
 drawing/ReadWrite.lua | 10 ++++++----
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/core b/core
index d10599a..532a808 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit d10599afc4b851673cdb788a7184361816822656
+Subproject commit 532a808bd316237644e763c7af80487fa6a36d8f
diff --git a/drawing/Memory.lua b/drawing/Memory.lua
index 65860db..78ade53 100644
--- a/drawing/Memory.lua
+++ b/drawing/Memory.lua
@@ -3,6 +3,7 @@ local Table = require 'Table'
 local Util = require 'Util'
 local Common = require 'Common'
 local Geometry = require 'Geometry'
+local func = require 'func'
 
 return function(update_freq)
    local MODULE_Y = 712
@@ -111,14 +112,15 @@ return function(update_freq)
    -- memory top table
 
    local NUM_ROWS = 5
-   local TABLE_CONKY = {}
-   for r = 1, NUM_ROWS do
-      TABLE_CONKY[r] = {
-         comm = '${top_mem name '..r..'}',
-         pid = '${top_mem pid '..r..'}',
-         mem = '${top_mem mem '..r..'}',
-      }
-   end
+   local TABLE_CONKY = func.map(
+      function(i)
+         return {
+            comm = '${top_mem name '..i..'}',
+            pid = '${top_mem pid '..i..'}',
+            mem = '${top_mem mem '..i..'}',
+         }
+      end,
+      func.seq(NUM_ROWS))
 
    local tbl = Common.initTable(
       Geometry.RIGHT_X,
diff --git a/drawing/Network.lua b/drawing/Network.lua
index 3de7bdd..7f9804c 100644
--- a/drawing/Network.lua
+++ b/drawing/Network.lua
@@ -1,6 +1,7 @@
 local Util = require 'Util'
 local Common = require 'Common'
 local Geometry = require 'Geometry'
+local func = require 'func'
 
 return function(update_freq)
    local PLOT_SEC_BREAK = 20
@@ -17,14 +18,13 @@ return function(update_freq)
 
    local INTERFACES = get_interfaces()
 
-   local INTERFACE_PATHS = {}
-   for i = 1, #INTERFACES do
-      local dir = string.format('/sys/class/net/%s/statistics/', INTERFACES[i])
-      INTERFACE_PATHS[i] = {
-         rx = dir..'rx_bytes',
-         tx = dir..'tx_bytes',
-      }
-   end
+   local INTERFACE_PATHS = func.map(
+      function(s)
+         local dir = string.format('/sys/class/net/%s/statistics/', s)
+         return {rx = dir..'rx_bytes', tx = dir..'tx_bytes'}
+      end,
+      INTERFACES
+   )
 
    local get_bits = function(path)
       return Util.read_file(path, nil, '*n') * 8
diff --git a/drawing/Processor.lua b/drawing/Processor.lua
index b6dfe24..dbae682 100644
--- a/drawing/Processor.lua
+++ b/drawing/Processor.lua
@@ -5,6 +5,7 @@ local Util = require 'Util'
 local Common = require 'Common'
 local Geometry = require 'Geometry'
 local CPU = require 'CPU'
+local func = require 'func'
 
 local __math_floor = math.floor
 
@@ -116,13 +117,10 @@ return function(update_freq)
    -- cpu top table
 
    local NUM_ROWS = 5
-   local TABLE_CONKY = {}
-   for r = 1, NUM_ROWS do
-      TABLE_CONKY[r] = {
-         pid = '${top pid '..r..'}',
-         cpu = '${top cpu '..r..'}'
-      }
-   end
+   local TABLE_CONKY = func.map(
+      function(i) return {pid = '${top pid '..i..'}', cpu = '${top cpu '..i..'}'} end,
+      func.seq(NUM_ROWS)
+   )
 
    local tbl = Common.initTable(
       Geometry.LEFT_X,
diff --git a/drawing/ReadWrite.lua b/drawing/ReadWrite.lua
index 50d9309..0f2b4f5 100644
--- a/drawing/ReadWrite.lua
+++ b/drawing/ReadWrite.lua
@@ -1,6 +1,7 @@
 local Util = require 'Util'
 local Common = require 'Common'
 local Geometry = require 'Geometry'
+local func = require 'func'
 
 return function(update_freq)
    local PLOT_SEC_BREAK = 20
@@ -17,10 +18,11 @@ return function(update_freq)
    local __tonumber = tonumber
    local __string_match = string.match
 
-   local DEVICE_PATHS = {}
-   for i = 1, #DEVICES do
-      DEVICE_PATHS[i] = string.format('/sys/block/%s/stat', DEVICES[i])
-   end
+   -- TODO any way to make better lambda functions?
+   local DEVICE_PATHS = func.map(
+      function(s) return string.format('/sys/block/%s/stat', s) end,
+      DEVICES
+   )
 
    local read_devices = function()
       local read_bytes = 0