From fa3ffe6513a03255c956f9cda2457c50a0e00b72 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 19 Feb 2022 10:13:12 +0000 Subject: [PATCH] Move mk_default_render_template to cdblib --- cdb | 9 +++------ cdblib.lua | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cdb b/cdb index 912c97a..df50eaf 100755 --- a/cdb +++ b/cdb @@ -141,10 +141,6 @@ local function argparse_flag_nul(c) :default(false) end -local function mk_default_render_template() - return pltext.Template("$e$h $f$z") -end - local function argparse_for_render(c) c:flag("--unescape") :description("Do not escape filenames ($f is $u); likely use --nul, too") @@ -160,7 +156,7 @@ end local function renderer_for(args) return cdblib.renderer_for(args.nul, args.unescape, args.format and pltext.Template(args.format) - or mk_default_render_template()) + or cdblib.mk_default_render_template()) end local function argparse_flag_inul(c) @@ -251,7 +247,8 @@ mksubcmd(function(c) local function log_new_hash() end if args.digest_log then local logf = assert(io.open(args.digest_log, "wb")) - local rend = cdblib.renderer_for(false, false, mk_default_render_template()) + local rend = cdblib.renderer_for(false, false, + cdblib.mk_default_render_template()) function log_new_hash(h, p) return logf:write(rend(h, p)) end diff --git a/cdblib.lua b/cdblib.lua index 3e3748c..f57ae17 100644 --- a/cdblib.lua +++ b/cdblib.lua @@ -183,6 +183,10 @@ function _M.renderer_for(nul, unescape, template) end end +function _M.mk_default_render_template() + return (require "pl.text").Template("$e$h $f$z") +end + ----------------------------------------------------------------- }}} ------------------------------------------- Path escape utilities {{{ -- 2.50.1