From 3d102843008f7de63b5cabe47891199bf5bb79c9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Feb 2016 22:31:13 +0100 Subject: util.template: Silence luacheck warnings about unused loop vars --- util/template.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/template.lua b/util/template.lua index a26dd7ca..f72c4ede 100644 --- a/util/template.lua +++ b/util/template.lua @@ -1,4 +1,4 @@ - +-- luacheck: ignore 213/i local stanza_mt = require "util.stanza".stanza_mt; local setmetatable = setmetatable; local pairs = pairs; -- cgit v1.2.3 From 7541fc06b17202b5cc55086094cc6a2ff2da3772 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Feb 2016 22:32:13 +0100 Subject: util.template: Use separate variables for source and compiled function [luacheck] --- util/template.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/template.lua b/util/template.lua index f72c4ede..04ebb93d 100644 --- a/util/template.lua +++ b/util/template.lua @@ -67,12 +67,12 @@ end local function create_cloner(stanza, chunkname) local lookup = {}; local name = create_clone_string(stanza, lookup, ""); - local f = "local setmetatable,stanza_mt=...;return function(data)"; + local src = "local setmetatable,stanza_mt=...;return function(data)"; for i=1,#lookup do - f = f.."local _"..i.."="..lookup[i]..";"; + src = src.."local _"..i.."="..lookup[i]..";"; end - f = f.."return "..name..";end"; - local f,err = loadstring(f, chunkname); + src = src.."return "..name..";end"; + local f,err = loadstring(src, chunkname); if not f then error(err); end return f(setmetatable, stanza_mt); end -- cgit v1.2.3 From 73a51150e034bb2257b88bd82b54fa786e4d32d9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Feb 2016 22:33:40 +0100 Subject: util.termcolours: Silence luacheck warning --- util/termcolours.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index a1c01aa5..e99294a4 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -5,6 +5,8 @@ -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- +-- +-- luacheck: ignore 213/i local t_concat, t_insert = table.concat, table.insert; -- cgit v1.2.3 From 1452ca3d5fe5fcc8fa7f5229c7122de979c5d8b7 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Feb 2016 22:33:58 +0100 Subject: util.termcolours: Remove argument from noop function [luacheck] --- util/termcolours.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index e99294a4..279ff601 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -84,7 +84,7 @@ if windows then end end if not orig_color then - function setstyle(style) end + function setstyle() end end end -- cgit v1.2.3 From 1370ab3c3a9a130e763149446ac4af6160a6cfc1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 25 Feb 2016 22:36:42 +0100 Subject: util.datamanager: Unreference file handle after closing it to prevent trying to close it again (fixes #632) --- util/datamanager.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'util') diff --git a/util/datamanager.lua b/util/datamanager.lua index a107d95c..c69ecd25 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -152,6 +152,7 @@ local function atomic_store(filename, data) if not ok then break end ok, msg = f:close(); + f = nil; -- no longer valid if not ok then break end return os_rename(scratch, filename); -- cgit v1.2.3 From f828dae360cb528ce67ff83ce9bf4476252b2643 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 27 Feb 2016 15:29:56 +0100 Subject: util.datamanager: Explicit handling of each error condition (see #632) --- util/datamanager.lua | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'util') diff --git a/util/datamanager.lua b/util/datamanager.lua index 07b2fe4a..dc98bd13 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -144,24 +144,26 @@ end local function atomic_store(filename, data) local scratch = filename.."~"; local f, ok, msg; - repeat - f, msg = io_open(scratch, "w"); - if not f then break end - ok, msg = f:write(data); - if not ok then break end + f, msg = io_open(scratch, "w"); + if not f then + return nil, msg; + end - ok, msg = f:close(); - f = nil; -- no longer valid - if not ok then break end + ok, msg = f:write(data); + if not ok then + f:close(); + os_remove(scratch); + return nil, msg; + end - return os_rename(scratch, filename); - until false; + ok, msg = f:close(); + if not ok then + os_remove(scratch); + return nil, msg; + end - -- Cleanup - if f then f:close(); end - os_remove(scratch); - return nil, msg; + return os_rename(scratch, filename); end if prosody and prosody.platform ~= "posix" then -- cgit v1.2.3 From 6fc40230c33b28576f30fa7681eeac33ac013edf Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 27 Feb 2016 16:47:12 +0100 Subject: util.termcolours: Add 256 color support --- util/termcolours.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index 279ff601..5d06fd35 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -14,6 +14,7 @@ local char, format = string.char, string.format; local tonumber = tonumber; local ipairs = ipairs; local io_write = io.write; +local m_floor = math.floor; local windows; if os.getenv("WINDIR") then @@ -55,6 +56,30 @@ local function getstring(style, text) end end +local function gray(n) + return m_floor(n*3/32)+0xe8; +end +local function color(r,g,b) + if r == g and g == b then + return gray(r); + end + r = m_floor(r*3/128); + g = m_floor(g*3/128); + b = m_floor(b*3/128); + return 0x10 + ( r * 36 ) + ( g * 6 ) + ( b ); +end +local function hex2rgb(hex) + local r = tonumber(hex:sub(1,2),16); + local g = tonumber(hex:sub(3,4),16); + local b = tonumber(hex:sub(5,6),16); + return r,g,b; +end + +setmetatable(stylemap, { __index = function(_, style) + local g = style:sub(7) == " background" and "48;5;" or "38;5;"; + return g .. color(hex2rgb(style)); +end } ); + local function getstyle(...) local styles, result = { ... }, {}; for i, style in ipairs(styles) do -- cgit v1.2.3 From 6ebfda549383872b983982f2ab472053195e27c5 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 27 Feb 2016 16:56:34 +0100 Subject: util.termcolours: Add some CSS color names --- util/termcolours.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index 5d06fd35..a0fee7ce 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -80,6 +80,18 @@ setmetatable(stylemap, { __index = function(_, style) return g .. color(hex2rgb(style)); end } ); +local csscolors = { + red = "ff0000"; fuchsia = "ff00ff"; green = "008000"; white = "ffffff"; + lime = "00ff00"; yellow = "ffff00"; purple = "800080"; blue = "0000ff"; + aqua = "00ffff"; olive = "808000"; black = "000000"; navy = "000080"; + teal = "008080"; silver = "c0c0c0"; maroon = "800000"; gray = "808080"; +} +for color, rgb in pairs(csscolors) do + stylemap[color] = stylemap[color] or stylemap[rgb]; + color, rgb = color .. " background", rgb .. " background" + stylemap[color] = stylemap[color] or stylemap[rgb]; +end + local function getstyle(...) local styles, result = { ... }, {}; for i, style in ipairs(styles) do -- cgit v1.2.3 From db5175995b4661a14255f3275f7ee3d4efbf6ce0 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 28 Feb 2016 15:03:01 +0100 Subject: util.termcolours: Validate color codes, fixes traceback --- util/termcolours.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index a0fee7ce..dcdc994d 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -15,6 +15,9 @@ local tonumber = tonumber; local ipairs = ipairs; local io_write = io.write; local m_floor = math.floor; +local type = type; +local setmetatable = setmetatable; +local pairs = pairs; local windows; if os.getenv("WINDIR") then @@ -76,8 +79,10 @@ local function hex2rgb(hex) end setmetatable(stylemap, { __index = function(_, style) - local g = style:sub(7) == " background" and "48;5;" or "38;5;"; - return g .. color(hex2rgb(style)); + if type(style) == "string" and style:find("%x%x%x%x%x%x") == 1 then + local g = style:sub(7) == " background" and "48;5;" or "38;5;"; + return g .. color(hex2rgb(style)); + end end } ); local csscolors = { -- cgit v1.2.3 From b1e82b124c1689dca204bd533843984dbe369c77 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 28 Feb 2016 15:03:16 +0100 Subject: util.termcolours: Rename loop variable [luacheck] --- util/termcolours.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/termcolours.lua b/util/termcolours.lua index dcdc994d..53633b45 100644 --- a/util/termcolours.lua +++ b/util/termcolours.lua @@ -91,10 +91,10 @@ local csscolors = { aqua = "00ffff"; olive = "808000"; black = "000000"; navy = "000080"; teal = "008080"; silver = "c0c0c0"; maroon = "800000"; gray = "808080"; } -for color, rgb in pairs(csscolors) do - stylemap[color] = stylemap[color] or stylemap[rgb]; - color, rgb = color .. " background", rgb .. " background" - stylemap[color] = stylemap[color] or stylemap[rgb]; +for colorname, rgb in pairs(csscolors) do + stylemap[colorname] = stylemap[colorname] or stylemap[rgb]; + colorname, rgb = colorname .. " background", rgb .. " background" + stylemap[colorname] = stylemap[colorname] or stylemap[rgb]; end local function getstyle(...) -- cgit v1.2.3