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:

#250 missing file patch
authorcopycat-killer <dada@archlinux.info>
Tue, 24 Jan 2017 17:19:15 +0000 (18:19 +0100)
committercopycat-killer <dada@archlinux.info>
Tue, 24 Jan 2017 17:19:15 +0000 (18:19 +0100)
12 files changed:
widgets/alsa.lua
widgets/alsabar.lua
widgets/bat.lua
widgets/cpu.lua
widgets/mem.lua
widgets/mpd.lua
widgets/net.lua
widgets/pulseaudio.lua
widgets/pulsebar.lua
widgets/sysload.lua
widgets/temp.lua
wiki

index c86db3340bbf3350d85bb6c57075e15414dd7136..96f30b333e8221c58b40575cf0c069940830c853 100644 (file)
@@ -46,11 +46,9 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
-    helpers.newtimer(timer_id, timeout, alsa.update)
-
-    return alsa
+    return setmetatable(alsa, { __index = alsa.widget })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
index 219ad96a1a8babfdc39d2eb5e11ca6711ba7797b..a4c63eaef28778d54f51adc82404bffa9332b0bb 100644 (file)
@@ -124,9 +124,7 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
-
-    helpers.newtimer(timer_id, timeout, alsabar.update)
+    helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 
     return alsabar
 end
index ea749d3614c9179e9b1f5397fe4d86af7d030bf7..8b62790104d287aa514cb556c707083e2493be0a 100644 (file)
@@ -120,31 +120,35 @@ local function worker(args)
         bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
 
         if bat_now.status ~= "N/A" then
+            if bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
+                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                                                               bat_now.time  = "00:00"
+                                                               bat_now.watt  = 0
+
             -- update {perc,time,watt} iff battery not full and rate > 0
-            if bat_now.status ~= "Full" and (sum_rate_power > 0 or sum_rate_current > 0) then
+            elseif bat_now.status ~= "Full" then
                 local rate_time = 0
-                local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current
-
-                if bat_now.status == "Charging" then
-                    rate_time = (sum_energy_full - sum_energy_now) / div
-                else -- Discharging
-                    rate_time = sum_energy_now / div
-                end
-
-                if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199)
-                    rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
-                    rate_time = rate_time * 10^(rate_time_magnitude - 2)
-                end
+                -- Calculate time and watt if rates are greater then 0
+                if (sum_rate_power > 0 or sum_rate_current > 0) then
+                    local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current
+
+                    if bat_now.status == "Charging" then
+                        rate_time = (sum_energy_full - sum_energy_now) / div
+                    else -- Discharging
+                        rate_time = sum_energy_now / div
+                    end
+
+                    if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199)
+                        rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
+                        rate_time = rate_time * 10^(rate_time_magnitude - 2)
+                    end
+                 end
 
                 local hours   = math.floor(rate_time)
                 local minutes = math.floor((rate_time - hours) * 60)
                 bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
                 bat_now.time  = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt  = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
-            elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
-                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
-                                                               bat_now.time  = "00:00"
-                                                               bat_now.watt  = 0
             elseif bat_now.status == "Full" then
                 bat_now.perc  = 100
                 bat_now.time  = "00:00"
@@ -171,9 +175,9 @@ local function worker(args)
         end
     end
 
-    newtimer(battery, timeout, bat.update)
-
-    return bat
+    newtimer("batteries", timeout, bat.update)
+    
+    return setmetatable(bat, { __index = bat.widget })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
index 8501388d759bda3f8e698c68a327f9183f12326c..f7fb0878bbfca104116e5030cf991f666feb5c32 100644 (file)
@@ -77,7 +77,7 @@ local function worker(args)
 
     newtimer("cpu", timeout, update)
 
-    return cpu.widget
+    return setmetatable(cpu, { __index = cpu.widget })
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })
index 443047c3f59d8327f13f84a931670bb532a6d618..e96dc1b735d1184a4ee4e3a32887015c6d813a3b 100644 (file)
@@ -50,7 +50,7 @@ local function worker(args)
 
     newtimer("mem", timeout, update)
 
-    return mem.widget
+    return setmetatable(mem, { __index = mem.widget })
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })
index ac4fd5f459e2d31ef8e831bff5488180e9fd44a3..df26422f70f7dc59720e896eb87d0ce4d7e206bd 100644 (file)
@@ -128,7 +128,7 @@ local function worker(args)
 
     mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true)
 
-    return mpd
+    return setmetatable(mpd, { __index = imap.widget })
 end
 
 return setmetatable(mpd, { __call = function(_, ...) return worker(...) end })
index 81345fc3bcd19040c00990180608afd0db231087..0b19f0b73656d3b2a361aace32a94e38af646352 100644 (file)
@@ -12,7 +12,6 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }
-local tostring     = tostring
 local setmetatable = setmetatable
 
 -- Network infos
@@ -118,9 +117,9 @@ local function worker(args)
         settings()
     end
 
-    helpers.newtimer("net-" .. tostring(net.iface), timeout, update)
+    helpers.newtimer("network", timeout, update)
 
-    return net
+    return setmetatable(net, { __index = net.widget })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
index f2d63d6cf9ae5bcbc1d654b4c90096c268ee450c..3178dcfc12f4be9fbc42008f2093692dafb667b6 100644 (file)
@@ -52,7 +52,7 @@ local function worker(args)
       end)
    end
 
-   helpers.newtimer(string.format("pulseaudio-%s", timeout), timeout, pulseaudio.update)
+   helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
 
    return setmetatable(pulseaudio, { __index = pulseaudio.widget })
 end
index 284b88653ac2c9e2cbc574f55a74d55d81a5ccd1..8cf8566ad83ff6e717c92495b27acef3577cc88c 100644 (file)
@@ -136,10 +136,7 @@ local function worker(args)
         end)
     end
 
-
-    timer_id = string.format("pulsebar-%s", pulsebar.sink)
-
-    helpers.newtimer(timer_id, timeout, pulsebar.update)
+    helpers.newtimer(string.format("pulsebar-%s", pulsebar.sink), timeout, pulsebar.update)
 
     return pulsebar
 end
index 215fd6230118dc130d48217094f03bd16b2ba43d..041feb189b9e8339ae5491e76bfc0f38494f8a5e 100644 (file)
@@ -36,7 +36,8 @@ local function worker(args)
     end
 
     newtimer("sysload", timeout, update)
-    return sysload.widget
+
+    return setmetatable(sysload, { __index = sysload.widget })
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })
index cdf30021bf42a4030d3695a3b785ee23f08e6c9d..e769b25e979f10cae428e5b83b0a2c4dba3da550 100644 (file)
@@ -39,7 +39,7 @@ local function worker(args)
 
     newtimer("coretemp", timeout, update)
 
-    return temp.widget
+    return setmetatable(temp, { __index = temp.widget })
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })
diff --git a/wiki b/wiki
index df5dd684ec35c1fc8e044fb5fd0bdb76f7f568fa..7e4865822c669a86007d88bf6ae846a95c5eed5f 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit df5dd684ec35c1fc8e044fb5fd0bdb76f7f568fa
+Subproject commit 7e4865822c669a86007d88bf6ae846a95c5eed5f