From: martin f. krafft Date: Sat, 2 Nov 2019 09:48:49 +0000 (+1300) Subject: switch to new awful.widgets.watch from lain X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/0106afdaea95741fb0af66a88ef887a126c1e7fd?ds=sidebyside switch to new awful.widgets.watch from lain --- diff --git a/.config/awesome/cryptocoin_widgets.lua b/.config/awesome/cryptocoin_widgets.lua index 4d83772..ef6435d 100644 --- a/.config/awesome/cryptocoin_widgets.lua +++ b/.config/awesome/cryptocoin_widgets.lua @@ -1,6 +1,6 @@ local dkjson = require("lain.util").dkjson local math = require("math") -local lain = require("lain") +local awful = require("awful") local beautiful = require("beautiful") local widgets = {} @@ -13,13 +13,12 @@ local function poloniex_price(output, pair, prec) return (not err and val) or "n/a" end -widgets.eth_widget = lain.widget.watch({ - cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'", - timeout = 600, - settings = function() - widget:set_text(poloniex_price(output, 'BTC_ETH') .. " Ƀ/Ξ") - end, -}) +widgets.eth_widget = awful.widget.watch( + "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'", 600, + function(widget, output) + widget:set_text(poloniex_price(output, 'BTC_ETH') .. " Ƀ/Ξ") + end +) local function coindesk_price(output, base, prec) local xc, pos, err = dkjson.decode(output, 1, nil) @@ -29,12 +28,11 @@ local function coindesk_price(output, base, prec) return (not err and val) or "n/a" end -widgets.btc_widget = lain.widget.watch({ - cmd = "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'", - timeout = 600, - settings = function() - widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ") - end -}) +widgets.btc_widget = awful.widget.watch( + "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'", 600, + function(widget, output) + widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ") + end +) return widgets diff --git a/.config/awesome/forex_widgets.lua b/.config/awesome/forex_widgets.lua index 66961cd..3ffc3bd 100644 --- a/.config/awesome/forex_widgets.lua +++ b/.config/awesome/forex_widgets.lua @@ -1,6 +1,6 @@ local dkjson = require("lain.util").dkjson local math = require("math") -local lain = require("lain") +local awful = require("awful") local beautiful = require("beautiful") local widgets = {} @@ -14,13 +14,12 @@ local function parse_ecb_rates(output, symbol, prec) return (not err and val) or "n/a" end -widgets.ecb_widget = lain.widget.watch({ - cmd = "curl -m5 -s 'https://api.exchangeratesapi.io/latest?base=EUR'", - timeout = 600, - settings = function() - widget:set_text(parse_ecb_rates(output, 'NZD') .. " NZD = " - .. parse_ecb_rates(output, 'CHF') .. " CHF") - end, -}) +widgets.ecb_widget = awful.widget.watch( + "curl -m5 -s 'https://api.exchangeratesapi.io/latest?base=EUR'", 600, + function(widget, output) + widget:set_text(parse_ecb_rates(output, 'NZD') .. " NZD = " + .. parse_ecb_rates(output, 'CHF') .. " CHF") + end +) return widgets