ndwarshuis
/
conky-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REF use setup framework for network

This commit is contained in:
Nathan Dwarshuis 2022-07-14 22:25:47 -04:00
parent e9d6a0eeee
commit 862241af6b
1 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
drawing/network.lua
View File

@ -1,4 +1,5 @@
local format = require 'format' local format = require 'format'
local pure = require 'pure'
local i_o = require 'i_o' local i_o = require 'i_o'
local common = require 'common' local common = require 'common'
local geometry = require 'geometry' local geometry = require 'geometry'
@ -13,26 +14,29 @@ return function(update_freq, point)
return i_o.read_file(path, nil, '*n') * 8 return i_o.read_file(path, nil, '*n') * 8
end end
local state = {rx_bits = 0, tx_bits = 0}
local read_interfaces = function() local read_interfaces = function()
local rx = 0 state.rx_bits = 0
local tx = 0 state.tx_bits = 0
for i = 1, #INTERFACE_PATHS do for i = 1, #INTERFACE_PATHS do
local p = INTERFACE_PATHS[i] local p = INTERFACE_PATHS[i]
rx = rx + get_bits(p.rx) state.rx_bits = state.rx_bits + get_bits(p.rx)
tx = tx + get_bits(p.tx) state.tx_bits = state.tx_bits + get_bits(p.tx)
end end
return rx, tx return state
end end
local init_rx_bits, init_tx_bits = read_interfaces() -- prime initial state
read_interfaces()
local value_format_function = function(bits) local value_format_function = function(bits)
local unit, value = format.convert_data_val(bits) local unit, value = format.convert_data_val(bits)
return format.precision_round_to_string(value, 3)..' '..unit..'b/s' return format.precision_round_to_string(value, 3)..' '..unit..'b/s'
end end
local make_plot = function(y, label, init) local mk_plot = function(label, key, y)
return common.make_rate_timeseries( local obj = common.make_rate_timeseries(
point.x, point.x,
y, y,
geometry.SECTION_WIDTH, geometry.SECTION_WIDTH,
@ -43,50 +47,43 @@ return function(update_freq, point)
label, label,
2, 2,
update_freq, update_freq,
init state[key]
)
return common.mk_acc(
PLOT_HEIGHT + PLOT_SEC_BREAK,
function(s) common.update_rate_timeseries(obj, s[key]) end,
pure.partial(common.tagged_scaled_timeseries_draw_static, obj),
pure.partial(common.tagged_scaled_timeseries_draw_dynamic, obj)
) )
end end
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- header -- header
local header = common.make_header( local mk_header = pure.partial(
point.x, common.mk_header,
point.y, 'NETWORK',
geometry.SECTION_WIDTH, geometry.SECTION_WIDTH,
'NETWORK' point.x
) )
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- download plot -- down/up plots
local rx = make_plot(header.bottom_y, 'Download', init_rx_bits) local mk_rx = pure.partial(mk_plot, 'Download', 'rx_bits')
local mk_tx = pure.partial(mk_plot, 'Upload', 'tx_bits')
-----------------------------------------------------------------------------
-- upload plot
local TX_Y = header.bottom_y + PLOT_HEIGHT + PLOT_SEC_BREAK * 2
local tx = make_plot(TX_Y, 'Upload', init_tx_bits)
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- main drawing functions -- main drawing functions
local update = function() local rbs = common.reduce_blocks_(
local rx_bits, tx_bits = read_interfaces() point.y,
common.update_rate_timeseries(rx, rx_bits) {
common.update_rate_timeseries(tx, tx_bits) common.mk_block(mk_header, true, 0),
end common.mk_block(mk_rx, true, 0),
common.mk_block(mk_tx, true, PLOT_SEC_BREAK),
}
)
local draw_static = function(cr) return pure.map_at("update", function(f) return function() f(read_interfaces()) end end, rbs)
common.draw_header(cr, header)
common.tagged_scaled_timeseries_draw_static(rx, cr)
common.tagged_scaled_timeseries_draw_static(tx, cr)
end
local draw_dynamic = function(cr)
common.tagged_scaled_timeseries_draw_dynamic(rx, cr)
common.tagged_scaled_timeseries_draw_dynamic(tx, cr)
end
return {static = draw_static, dynamic = draw_dynamic, update = update}
end end