From 3fc0ed44dc2169d10a42f1c6f6ea39be7dc310dd Mon Sep 17 00:00:00 2001 From: luke bonham Date: Wed, 29 Jan 2014 11:56:32 +0100 Subject: [PATCH] new I/O file helper functions --- helpers.lua | 45 ++++++++++++++++++++++++++++++++----------- widgets/maildir.lua | 1 + widgets/yawn/init.lua | 1 + wiki | 2 +- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/helpers.lua b/helpers.lua index c42ce61..08aba0d 100644 --- a/helpers.lua +++ b/helpers.lua @@ -10,7 +10,8 @@ local debug = require("debug") local capi = { timer = timer } -local io = { open = io.open } +local io = { open = io.open, + lines = io.lines } local rawget = rawget -- Lain helper functions for internal use @@ -30,18 +31,40 @@ end -- }}} --- {{{ Read the first line of a file or return nil +-- {{{ File operations -function helpers.first_line(f) - local fp = io.open(f) - if not fp - then - return nil - end +-- see if the file exists +function helpers.file_exists(file) + local f = io.open(file, "rb") + if f then f:close() end + return f ~= nil +end + + +-- get all lines from a file, returns an empty +-- list/table if the file does not exist +function helpers.lines_from(file) + if not helpers.file_exists(file) then return {} end + lines = {} + for line in io.lines(file) do + lines[#lines + 1] = line + end + return lines +end + +-- get first line of a file, return nil if +-- the file does not exist +function helpers.first_line(file) + return helpers.lines_from(file)[1] +end - local content = fp:read("*l") - fp:close() - return content +-- get first non empty line from a file, +-- returns nil otherwise +function helpers.first_nonempty_line(file) + for k,v in pairs(lines_from(file)) do + if #v then return v end + end + return nil end -- }}} diff --git a/widgets/maildir.lua b/widgets/maildir.lua index 5cb6840..d460881 100644 --- a/widgets/maildir.lua +++ b/widgets/maildir.lua @@ -1,3 +1,4 @@ + --[[ Licensed under GNU General Public License v2 diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua index 36cdf54..b4d9c05 100644 --- a/widgets/yawn/init.lua +++ b/widgets/yawn/init.lua @@ -1,3 +1,4 @@ + --[[ Licensed under GNU General Public License v2 diff --git a/wiki b/wiki index 2fe55cb..6825e84 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 2fe55cb50b4192866551d50dce563a52234961c7 +Subproject commit 6825e84bb73415c4cbf5fcd903ea4987976e4be3 -- 2.39.5