Merge branch 'master' of http://git.sysphere.org/vicious

README

@@ -167,7 +167,8 @@ vicious.widgets.fs
 
 vicious.widgets.dio
   - provides I/O statistics for requested storage devices
-  - takes the disk as an argument, i.e. "sda"
+  - takes the disk as an argument, i.e. "sda" (or a specific
+    partition, i.e. "sda/sda2")
   - returns a table with string keys: {total_s}, {total_kb}, {total_mb},
     {read_s}, {read_kb}, {read_mb}, {write_s}, {write_kb}, {write_mb}
     and {sched}
@@ -186,12 +187,12 @@ vicious.widgets.hddtemp
     {/dev/sda} and {/dev/sdc} for example
 
 vicious.widgets.net
-  - provides usage statistics for all network interfaces
+  - provides state and usage statistics of all network interfaces
   - returns a table with string keys, using net interfaces as a base:
-    {eth0 rx_b}, {eth0 tx_b}, {eth0 rx_kb}, {eth0 tx_kb}, {eth0 rx_mb},
-    {eth0 tx_mb}, {eth0 rx_gb}, {eth0 tx_gb}, {eth0 down_b}, {eth0 up_b},
-    {eth0 down_kb}, {eth0 up_kb}, {eth0 down_mb}, {eth0 up_mb},
-    {eth0 down_gb}, {eth0 up_gb}, {eth1 rx_b} etc.
+    {eth0 carrier}, {eth0 rx_b}, {eth0 tx_b}, {eth0 rx_kb}, {eth0 tx_kb},
+    {eth0 rx_mb}, {eth0 tx_mb}, {eth0 rx_gb}, {eth0 tx_gb}, {eth0 down_b},
+    {eth0 up_b}, {eth0 down_kb}, {eth0 up_kb}, {eth0 down_mb},
+    {eth0 up_mb}, {eth0 down_gb}, {eth0 up_gb}, {eth1 rx_b} etc.
 
 vicious.widgets.wifi
   - provides wireless information for a requested interface

TODO

@@ -0,0 +1,34 @@
+#-*- mode: org -*-
+#+TYP_TODO: TODO MAYBE CANCEL WAITING NEXT NOTE DONE
+#+STARTUP: showall
+#+STARTUP: hidestars
+
+
+* Vicious
+** TODO Consider multigraph, graph stacking, support
+** TODO Consider including this code in format helper
+   - return format and format:gsub("${[^}]+}", "")
+   - Note: We should then also replace just $1/$2...
+** TODO Include Name and file in MPD widget
+** TODO Complete the hddtemp fix
+   - In certain setups regexp does not match all devices
+     - The regexp catches the first device name, but last stats
+     - Shortening the match introduced new problems IIRC
+** TODO Expand raid to grab data for all available devices
+** TODO Add fan speed to thermal.lua
+** TODO Return values of type number in NET and FS
+   - Note: tonumber() strips decimal points
+** MAYBE Simplify scrolling using negative margins + fixed width
+** TODO Try to simplify truncating with a fixed width
+** NOTE Changelog header
+---------------------------------------------------
+Full changelog is available online:
+    http://git.sysphere.org/vicious/log/?showmsg=1
+---------------------------------------------------
+
+
+* Git
+** DONE Git hook post-update not executed on git push
+** DONE Git post-update hook does not leave info/refs with correct permissions
+** DONE Git persmission are incorrect since 1.6.5, does not honor umask
+** TODO Git smart http transport with cgit

widgets/dio.lua

@@ -61,7 +61,7 @@ local function worker(format, disk)
     helpers.uformat(disk_usage[disk], "total", diff_total[disk][7] + diff_total[disk][3], unit)
 
     -- Store I/O scheduler
-    if disk_stats.queue.scheduler then
+    if disk_stats.queue and disk_stats.queue.scheduler then
         disk_usage[disk]["{sched}"] = string.gmatch(disk_stats.queue.scheduler, "%[([%a]+)%]")
     end
 

widgets/hddtemp.lua

@@ -17,7 +17,7 @@ module("vicious.widgets.hddtemp")
 
 -- {{{ HDD Temperature widget type
 local function worker(format, warg)
-    -- Fallback to default hddtemp warg
+    -- Fallback to default hddtemp port
     if warg == nil then warg = 7634 end
 
     local hdd_temp = {} -- Get info from the hddtemp daemon

widgets/net.lua

@@ -14,7 +14,7 @@ local helpers = require("vicious.helpers")
 -- }}}
 
 
--- Net: provides usage statistics for all network interfaces
+-- Net: provides state and usage statistics of all network interfaces
 module("vicious.widgets.net")
 
 
@@ -43,6 +43,10 @@ local function worker(format)
             helpers.uformat(args, name .. " rx", recv, unit)
             helpers.uformat(args, name .. " tx", send, unit)
 
+            -- Operational state and carrier detection
+            local sysnet = helpers.pathtotable("/sys/class/net/" .. name)
+            args["{"..name.." carrier}"] = tonumber(sysnet.carrier) or 0
+
             if nets[name] == nil then
                 -- Default values on the first run
                 nets[name] = {}

widgets/raid.lua

@@ -44,7 +44,7 @@ local function worker(format, warg)
         elseif string.sub(line, 1, string.len(warg)) == warg then
             mddev[warg]["found"] = true
 
-            for i in string.gmatch(line, "%[%d%]") do
+            for i in string.gmatch(line, "%[[%d]%]") do
                 mddev[warg]["assigned"] = mddev[warg]["assigned"] + 1
             end
         end