From 9e2ca04c823bab13ea562e9c3fd8e19dd41110c4 Mon Sep 17 00:00:00 2001 From: petrucci4prez Date: Mon, 17 Jul 2017 02:42:53 -0400 Subject: [PATCH] optimize Pacman.lua --- module/Pacman.lua | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/module/Pacman.lua b/module/Pacman.lua index d2bda1f..c112805 100644 --- a/module/Pacman.lua +++ b/module/Pacman.lua @@ -1,4 +1,3 @@ -local _CR = require 'CR' local Widget = require 'Widget' local Text = require 'Text' local Line = require 'Line' @@ -6,6 +5,19 @@ local TextColumn = require 'TextColumn' local util = require 'util' local schema = require 'default_patterns' +local PACMAN_TABLE = { + 'pacman -Qq', + 'pacman -Qeq', + 'pacman -Quq', + 'pacman -Qdtq', + 'pacman -Qmq' +} + +local _INITIAL_PGK_CNT_ = {} +for i, cmd in pairs(PACMAN_TABLE) do + _INITIAL_PGK_CNT_[i] = util.line_count(util.execute_cmd(cmd)) +end + local _TEXT_SPACING_ = 20 local header = Widget.Header{ @@ -31,28 +43,20 @@ local info = Widget.TextColumn{ spacing = _TEXT_SPACING_, x_align = 'right', text_color = schema.blue, - num_rows = 5, + unpack(_INITIAL_PGK_CNT_) } Widget = nil schema = nil _TEXT_SPACING_ = nil +_INITIAL_PGK_CNT_ = nil local update = function(cr) - local _execute_cmd = util.execute_cmd - local _line_count = util.line_count - - TextColumn.set(info, cr, 1, _line_count(_execute_cmd('pacman -Q'))) - TextColumn.set(info, cr, 2, _line_count(_execute_cmd('pacman -Qe'))) - TextColumn.set(info, cr, 3, _line_count(_execute_cmd('pacman -Qu'))) - TextColumn.set(info, cr, 4, _line_count(_execute_cmd('pacman -Qdt'))) - TextColumn.set(info, cr, 5, _line_count(_execute_cmd('pacman -Qm'))) + for i, cmd in pairs(PACMAN_TABLE) do + TextColumn.set(info, cr, i, util.line_count(util.execute_cmd(cmd))) + end end -update(_CR) - -_CR = nil - local draw = function(cr, current_interface, trigger) if trigger == 0 then update(cr) end