]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

whitespaces removed
authorLuke Bonham <dada@archlinux.info>
Mon, 4 Apr 2016 12:09:54 +0000 (14:09 +0200)
committerLuke Bonham <dada@archlinux.info>
Mon, 4 Apr 2016 12:09:54 +0000 (14:09 +0200)
widgets/bat.lua
widgets/net.lua

index 13916410d2757689e37f078d603d6cfd075a5d9e..d3185890d04032cd8e3165b0090278bf245e3a38 100644 (file)
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[
-                                                                                                 
+                                                                                                                       
         Licensed under GNU General Public License v2 
          * (c) 2013,      Luke Bonham                
          * (c) 2010-2012, Peter Hofmann              
         Licensed under GNU General Public License v2 
          * (c) 2013,      Luke Bonham                
          * (c) 2010-2012, Peter Hofmann              
-                                                                                                 
+                                                                                                                       
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
@@ -71,39 +71,38 @@ local function worker(args)
 
                        -- energy_now(P)[uWh], charge_now(I)[uAh]
                        local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
 
                        -- energy_now(P)[uWh], charge_now(I)[uAh]
                        local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
-                                      first_line(bstr .. "/charge_now"))
+                                first_line(bstr .. "/charge_now"))
 
                        -- energy_full(P)[uWh], charge_full(I)[uAh],
                        local energy_full       = tonumber(first_line(bstr .. "/energy_full") or
 
                        -- energy_full(P)[uWh], charge_full(I)[uAh],
                        local energy_full       = tonumber(first_line(bstr .. "/energy_full") or
-                                      first_line(bstr .. "/charge_full"))
+                                first_line(bstr .. "/charge_full"))
 
 
                        local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
 
 
                        local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
-                                      math.floor((energy_now / energy_full) * 100)
+                                math.floor((energy_now / energy_full) * 100)
 
                        bat_now.status    = first_line(bstr .. "/status") or "N/A"
                        bat_now.ac_status = first_line(astr .. "/online") or "N/A"
 
                        -- if rate = 0 or rate not defined skip the round
                        if      not (rate_power and rate_power > 0) and
 
                        bat_now.status    = first_line(bstr .. "/status") or "N/A"
                        bat_now.ac_status = first_line(astr .. "/online") or "N/A"
 
                        -- if rate = 0 or rate not defined skip the round
                        if      not (rate_power and rate_power > 0) and
-                               not (rate_current and  rate_current > 0) and
-                               not (bat_now.status == "Full")
+          not (rate_current and  rate_current > 0) and
+          not (bat_now.status == "Full")
                        then
                        then
-                               return
+          return
                        end
 
                        local rate_time = 0
                        if bat_now.status == "Charging" then
                        end
 
                        local rate_time = 0
                        if bat_now.status == "Charging" then
-                           rate_time = (energy_full - energy_now) / (rate_power or rate_current)
+          rate_time = (energy_full - energy_now) / (rate_power or rate_current)
                        elseif bat_now.status == "Discharging" then
                        elseif bat_now.status == "Discharging" then
-                           rate_time = energy_now / (rate_power or rate_current)
+          rate_time = energy_now / (rate_power or rate_current)
                        end
 
                        local hours   = math.floor(rate_time)
                        local minutes = math.floor((rate_time - hours) * 60)
                        end
 
                        local hours   = math.floor(rate_time)
                        local minutes = math.floor((rate_time - hours) * 60)
-                        
-                        local watt    = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
-                        
+      local watt    = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
+
                        bat_now.perc = string.format("%d", energy_percentage)
                        bat_now.time = string.format("%02d:%02d", hours, minutes)
                        bat_now.watt = string.format("%.2fW", watt)
                        bat_now.perc = string.format("%d", energy_percentage)
                        bat_now.time = string.format("%02d:%02d", hours, minutes)
                        bat_now.watt = string.format("%.2fW", watt)
@@ -129,7 +128,7 @@ local function worker(args)
                end
        end
 
                end
        end
 
-       newtimer(battery, timeout, update)
+  newtimer(battery, timeout, update)
 
        return setmetatable(bat, { __index = bat.widget })
 end
 
        return setmetatable(bat, { __index = bat.widget })
 end
index a4b1097b1b52616cbb02793de1c4c81dca1ed8be..da2130f8e11ea031a9dae902cda4da8b90cca7f9 100644 (file)
@@ -56,7 +56,7 @@ local function worker(args)
         local now_t      = helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', iface)) or 0
         local now_r      = helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', iface)) or 0
 
         local now_t      = helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', iface)) or 0
         local now_r      = helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', iface)) or 0
 
-        if now_t ~= net.last_t or now_r ~= net.last_r then  
+        if now_t ~= net.last_t or now_r ~= net.last_r then
             net_now.sent     = (now_t - net.last_t) / timeout / units
             net_now.sent     = string.gsub(string.format('%.1f', net_now.sent), ',', '.')
             net_now.received = (now_r - net.last_r) / timeout / units
             net_now.sent     = (now_t - net.last_t) / timeout / units
             net_now.sent     = string.gsub(string.format('%.1f', net_now.sent), ',', '.')
             net_now.received = (now_r - net.last_r) / timeout / units