From 70e24a8fcbf3e99df85ac421414eee20c5f57a97 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 19 Mar 2022 19:34:22 +0100 Subject: Cleanup: remove some duplicated code. --- src/lib/kdm_with_metadata.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/lib/kdm_with_metadata.cc') diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index e3c0d9204..716d29d9c 100644 --- a/src/lib/kdm_with_metadata.cc +++ b/src/lib/kdm_with_metadata.cc @@ -220,17 +220,16 @@ send_emails ( zip_file /= container_name_format.get(i.front()->name_values(), ".zip"); make_zip_file (i, zip_file, filename_format); - auto subject = config->kdm_subject(); - boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (subject, "$START_TIME", i.front()->get('b').get_value_or("")); - boost::algorithm::replace_all (subject, "$END_TIME", i.front()->get('e').get_value_or("")); - boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.front()->get('c').get_value_or("")); - - auto body = config->kdm_email(); - boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (body, "$START_TIME", i.front()->get('b').get_value_or("")); - boost::algorithm::replace_all (body, "$END_TIME", i.front()->get('e').get_value_or("")); - boost::algorithm::replace_all (body, "$CINEMA_NAME", i.front()->get('c').get_value_or("")); + auto substitute_variables = [cpl_name, i](string target) { + boost::algorithm::replace_all (target, "$CPL_NAME", cpl_name); + boost::algorithm::replace_all (target, "$START_TIME", i.front()->get('b').get_value_or("")); + boost::algorithm::replace_all (target, "$END_TIME", i.front()->get('e').get_value_or("")); + boost::algorithm::replace_all (target, "$CINEMA_NAME", i.front()->get('c').get_value_or("")); + return target; + }; + + auto subject = substitute_variables(config->kdm_subject()); + auto body = substitute_variables(config->kdm_email()); string screens; for (auto j: i) { -- cgit v1.2.3