diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-19 19:34:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-19 19:34:22 +0100 |
| commit | 37781c996059c6ccf5e9456556e515f12c6eb814 (patch) | |
| tree | 51ccb4b14526e50d05f376539f15942960b32cdf | |
| parent | a2bdced822df55f22b88d1da4e5d5c6a04339528 (diff) | |
Cleanup: remove some duplicated code.
| -rw-r--r-- | src/lib/kdm_with_metadata.cc | 21 |
1 files changed, 10 insertions, 11 deletions
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) { |