From: Aleksandr Beliaev Date: Thu, 2 Jun 2016 07:39:25 +0000 (+1200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/095bff7b26eb55b84753fbfe556ff7d9f452cfa0?hp=0493baffd5f17b6331974ae1dac4d404d016e351 Merge remote-tracking branch 'upstream/master' Merge with upstream/master --- diff --git a/widgets/bat.lua b/widgets/bat.lua index 43b7a5f..3b9cca0 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -23,13 +23,13 @@ local setmetatable = setmetatable -- lain.widgets.bat local function worker(args) - local bat = {} - local args = args or {} - local timeout = args.timeout or 30 - local battery = args.battery or "BAT0" - local ac = args.ac or "AC0" - local notify = args.notify or "on" - local settings = args.settings or function() end + local bat = {} + local args = args or {} + local timeout = args.timeout or 30 + local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"} + local ac = args.ac or "AC0" + local notify = args.notify or "on" + local settings = args.settings or function() end bat.widget = wibox.widget.textbox('') @@ -49,59 +49,84 @@ local function worker(args) bg = "#FFFFFF" } - function update() - bat_now = { - status = "Not present", - ac_status = "N/A", - perc = "N/A", - time = "N/A", - watt = "N/A" - } - - local bstr = "/sys/class/power_supply/" .. battery - local astr = "/sys/class/power_supply/" .. ac - local present = first_line(bstr .. "/present") - - if present == "1" - then - -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW] - local rate_current = tonumber(first_line(bstr .. "/current_now")) - local rate_voltage = tonumber(first_line(bstr .. "/voltage_now")) - local rate_power = tonumber(first_line(bstr .. "/power_now")) + bat_now = { + status = "Not present", + ac_status = "N/A", + perc = "N/A", + time = "N/A", + watt = "N/A" + } + + bat_now.n_status = {} + for i = 1, #batteries do + bat_now.n_status[i] = "Not present" + end - -- energy_now(P)[uWh], charge_now(I)[uAh] - local energy_now = tonumber(first_line(bstr .. "/energy_now") or - first_line(bstr .. "/charge_now")) + function update() + local sum_rate_current = 0 + local sum_rate_voltage = 0 + local sum_rate_power = 0 + local sum_energy_now = 0 + local sum_energy_full = 0 + local sum_energy_percentage = 0 + + for i, battery in ipairs(batteries) do + local bstr = "/sys/class/power_supply/" .. battery + local present = first_line(bstr .. "/present") + + if present == "1" + then + -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW] + local rate_current = tonumber(first_line(bstr .. "/current_now")) + local rate_voltage = tonumber(first_line(bstr .. "/voltage_now")) + local rate_power = tonumber(first_line(bstr .. "/power_now")) - -- energy_full(P)[uWh], charge_full(I)[uAh] - local energy_full = tonumber(first_line(bstr .. "/energy_full") or - first_line(bstr .. "/charge_full")) + -- energy_now(P)[uWh], charge_now(I)[uAh] + local energy_now = tonumber(first_line(bstr .. "/energy_now") or + first_line(bstr .. "/charge_now")) - local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or - math.floor((energy_now / energy_full) * 100) + -- energy_full(P)[uWh], charge_full(I)[uAh] + local energy_full = tonumber(first_line(bstr .. "/energy_full") or + first_line(bstr .. "/charge_full")) - bat_now.status = first_line(bstr .. "/status") or "N/A" - bat_now.ac_status = first_line(astr .. "/online") or "N/A" + local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or + math.floor((energy_now / energy_full) * 100) - -- update {perc,time,watt} iff rate > 0 and battery not full - if ((rate_current and rate_current > 0) or (rate_power and rate_power > 0)) - and bat_now.status ~= "N/A" and bat_now.status ~= "Full" - then - local rate_time = 0 - if bat_now.status == "Charging" then - rate_time = (energy_full - energy_now) / (rate_power or rate_current) - elseif bat_now.status == "Discharging" then - rate_time = energy_now / (rate_power or rate_current) + if bat_now.n_status[i] ~= "Charging" and bat_now.n_status[i] ~= "Discharging" + then + bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A" 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 + sum_rate_current = sum_rate_current + (rate_current or 0) + sum_rate_voltage = sum_rate_voltage + rate_voltage + sum_rate_power = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6)) + sum_energy_now = sum_energy_now + energy_now + sum_energy_full = sum_energy_full + energy_full + sum_energy_percentage = sum_energy_percentage + energy_percentage + end + end - bat_now.perc = string.format("%d", math.min(100, energy_percentage)) - bat_now.time = string.format("%02d:%02d", hours, minutes) - bat_now.watt = string.format("%.2fW", watt) + bat_now.status = bat_now.n_status[1] + bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A" + + -- update {perc,time,watt} iff rate > 0 and battery not full + if (sum_rate_current > 0 or sum_rate_power > 0) and not (bat_now.status == "Full") + then + local rate_time = 0 + + if bat_now.status == "Charging" then + rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current) + elseif bat_now.status == "Discharging" then + rate_time = sum_energy_now / (sum_rate_power or sum_rate_current) end + + local hours = math.floor(rate_time) + local minutes = math.floor((rate_time - hours) * 60) + local watt = sum_rate_power / 1e6 + + bat_now.perc = string.format("%d", math.min(100, sum_energy_percentage / #batteries)) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = string.format("%.2fW", watt) end widget = bat.widget diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua index 6955b04..5004be6 100644 --- a/widgets/pulsebar.lua +++ b/widgets/pulsebar.lua @@ -1,10 +1,10 @@ --[[ - - Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - * (c) 2013, Rman - + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2013, Rman + --]] local newtimer = require("lain.helpers").newtimer diff --git a/widgets/weather.lua b/widgets/weather.lua index 042d1e7..b074cff 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -16,12 +16,14 @@ local lain_icons = require("lain.helpers").icons_dir local naughty = require("naughty") local wibox = require("wibox") -local math = { floor = math.floor } +local math = { floor = math.floor } +local os = { time = os.time, + date = os.date, + difftime = os.difftime } +local string = { format = string.format, + gsub = string.gsub } + local mouse = mouse -local os = { time = os.time } -local string = { format = string.format, - gsub = string.gsub } -local naughty = require("naughty") local tonumber = tonumber local setmetatable = setmetatable @@ -38,7 +40,11 @@ local function worker(args) local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" local city_id = args.city_id or 0 -- placeholder - local utc = args.utc or 0 + local utc_offset = args.utc_offset or + function () + local now = os.time() + return os.difftime(now, os.time(os.date("!*t", now))) + (os.date("*t").isdst and 3600) + end local units = args.units or "metric" local lang = args.lang or "en" local cnt = args.cnt or 5 @@ -51,7 +57,6 @@ local function worker(args) local tmin = math.floor(wn["temp"]["min"]) local tmax = math.floor(wn["temp"]["max"]) local desc = wn["weather"][1]["description"] - return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) end local weather_na_markup = args.weather_na_markup or " N/A " @@ -73,7 +78,6 @@ local function worker(args) weather.forecast_update() end - weather.notification = naughty.notify({ text = weather.notification_text, icon = weather.icon_path, @@ -120,34 +124,29 @@ local function worker(args) function weather.update() local cmd = string.format(current_call, city_id, units, lang, APPID) - local utc_midnight_cmd = string.format("date -u -d 'today 00:00:00' +'%%s'") - local local_midnight_cmd = string.format("date -d 'today 00:00:00' +'%%s'") - async.request(cmd, function(f) local pos, err, icon weather_now, pos, err = json.decode(f, 1, nil) if not err and weather_now and tonumber(weather_now["cod"]) == 200 then -- weather icon based on localtime - now = os.time() - local utc_midnight = string.gsub(read_pipe(utc_midnight_cmd), "\n", "") - local local_midnight = string.gsub(read_pipe(local_midnight_cmd), "\n", "") - - if utc > 0 then -- we are to the East from GMT - if tonumber(local_midnight) >= tonumber(utc_midnight) then -- we are 1 day after the GMT, so have to return 1 day back - now = now - 86400 - end - end - - if utc < 0 then -- we are to the West from GMT - if tonumber(local_midnight) <= tonumber(utc_midnight) then -- we are 1 day before the GMT - now = now + 86400 - end - end - -- if utc==0 leave it as is + local now = os.time() local sunrise = tonumber(weather_now["sys"]["sunrise"]) local sunset = tonumber(weather_now["sys"]["sunset"]) local icon = weather_now["weather"][1]["icon"] + local utc_m = string.gsub(read_pipe(string.format("date -u -d 'today 00:00:00' +'%%s'")), "\n", "") + local loc_m = string.gsub(read_pipe(string.format("date -d 'today 00:00:00' +'%%s'")), "\n", "") + + loc_m = tonumber(loc_m) + utc_m = tonumber(utc_m) + offset = utc_offset() + + -- if we are 1 day after the GMT, return 1 day back, and viceversa + if offset > 0 and loc_m >= utc_m then + now = now - 86400 + elseif offset < 0 and loc_m <= utc_m then + now = now + 86400 + end if sunrise <= now and now <= sunset then icon = string.gsub(icon, "n", "d") @@ -156,7 +155,6 @@ local function worker(args) end weather.icon_path = icons_path .. icon .. ".png" - widget = weather.widget settings() else diff --git a/wiki b/wiki index fea7079..25dd1a2 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit fea7079ab58cbbea9c18733485f264bc154fe580 +Subproject commit 25dd1a2ec44da832d06ded29f393d716e4b54783