From: Quan Guo Date: Fri, 29 Jan 2016 19:42:56 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/copycat-killer/lain X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/47a00516d88c42378b487ba302835097c3138099?ds=inline;hp=-c;pf=etc Merge branch 'master' of https://github.com/copycat-killer/lain --- 47a00516d88c42378b487ba302835097c3138099 diff --combined helpers.lua index 70ca029,4ece329..5e958c3 --- a/helpers.lua +++ b/helpers.lua @@@ -8,11 -8,12 +8,12 @@@ local debug = require("debug") -local capi = { timer = timer } +local capi = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) } local io = { open = io.open, lines = io.lines, popen = io.popen } local rawget = rawget + local table = { sort = table.sort } -- Lain helper functions for internal use -- lain.helpers @@@ -113,4 -114,23 +114,23 @@@ en -- }}} + --{{{ Iterate over table of records sorted by keys + function helpers.spairs(t) + -- collect the keys + local keys = {} + for k in pairs(t) do keys[#keys+1] = k end + + table.sort(keys) + + -- return the iterator function + local i = 0 + return function() + i = i + 1 + if keys[i] then + return keys[i], t[keys[i]] + end + end + end + --}}} + return helpers