X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.cc;h=0ef1b8f380b1fc305366470b3278ce2be991c980;hp=bf24f709d69a72cf19ef099f02a9afc9d1281f45;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=0a1d944d74308ccb940194bcb627652c72128650 diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index bf24f709d..0ef1b8f38 100644 --- a/src/lib/kdm_with_metadata.cc +++ b/src/lib/kdm_with_metadata.cc @@ -44,7 +44,6 @@ write_files ( list kdms, boost::filesystem::path directory, dcp::NameFormat name_format, - dcp::NameFormat::Map name_values, boost::function confirm_overwrite ) { @@ -66,7 +65,7 @@ write_files ( /* Write KDMs to the specified directory */ BOOST_FOREACH (KDMWithMetadataPtr i, kdms) { - boost::filesystem::path out = directory / careful_string_filter(name_format.get(name_values, ".xml")); + boost::filesystem::path out = directory / careful_string_filter(name_format.get(i->name_values(), ".xml")); if (!boost::filesystem::exists (out) || confirm_overwrite (out)) { i->kdm_as_xml (out); ++written; @@ -90,12 +89,12 @@ KDMWithMetadata::get (char k) const void -make_zip_file (list kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) +make_zip_file (list kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format) { Zipper zipper (zip_file); BOOST_FOREACH (KDMWithMetadataPtr i, kdms) { - string const name = careful_string_filter(name_format.get(name_values, ".xml")); + string const name = careful_string_filter(name_format.get(i->name_values(), ".xml")); zipper.add (name, i->kdm_as_xml()); } @@ -104,7 +103,7 @@ make_zip_file (list kdms, boost::filesystem::path zip_file, /** Collect a list of KDMWithMetadatas into a list of lists so that - * each list contains the KDMs for one cinema. + * each list contains the KDMs for one list. */ list > collect (list kdms) @@ -116,7 +115,7 @@ collect (list kdms) list >::iterator j = grouped.begin (); while (j != grouped.end()) { - if (j->front()->cinema() == i->cinema()) { + if (j->front()->group() == i->group()) { j->push_back (i); break; } @@ -133,28 +132,24 @@ collect (list kdms) } -/** Write one directory per cinema into another directory */ +/** Write one directory per list into another directory */ int write_directories ( - list > cinema_kdms, + list > kdms, boost::filesystem::path directory, dcp::NameFormat container_name_format, dcp::NameFormat filename_format, - dcp::NameFormat::Map name_values, function confirm_overwrite ) { - /* No specific screen */ - name_values['s'] = ""; - int written = 0; - BOOST_FOREACH (list const & i, cinema_kdms) { + BOOST_FOREACH (list const & i, kdms) { boost::filesystem::path path = directory; - path /= container_name_format.get(name_values, ""); + path /= container_name_format.get(i.front()->name_values(), "", "s"); if (!boost::filesystem::exists (path) || confirm_overwrite (path)) { boost::filesystem::create_directories (path); - write_files (i, path, filename_format, name_values, confirm_overwrite); + write_files (i, path, filename_format, confirm_overwrite); } written += i.size(); } @@ -166,28 +161,24 @@ write_directories ( /** Write one ZIP file per cinema into a directory */ int write_zip_files ( - list > cinema_kdms, + list > kdms, boost::filesystem::path directory, dcp::NameFormat container_name_format, dcp::NameFormat filename_format, - dcp::NameFormat::Map name_values, function confirm_overwrite ) { - /* No specific screen */ - name_values['s'] = ""; - int written = 0; - BOOST_FOREACH (list const & i, cinema_kdms) { + BOOST_FOREACH (list const & i, kdms) { boost::filesystem::path path = directory; - path /= container_name_format.get(name_values, ".zip"); + path /= container_name_format.get(i.front()->name_values(), ".zip", "s"); if (!boost::filesystem::exists (path) || confirm_overwrite (path)) { if (boost::filesystem::exists (path)) { /* Creating a new zip file over an existing one is an error */ boost::filesystem::remove (path); } - make_zip_file (i, path, filename_format, name_values); + make_zip_file (i, path, filename_format); written += i.size(); } } @@ -197,7 +188,7 @@ write_zip_files ( /** Email one ZIP file per cinema to the cinema. - * @param cinema_kdms KDMS to email. + * @param kdms KDMs to email. * @param container_name_format Format of folder / ZIP to use. * @param filename_format Format of filenames to use. * @param name_values Values to substitute into \p container_name_format and \p filename_format. @@ -205,10 +196,9 @@ write_zip_files ( */ void email ( - list > cinema_kdms, + list > kdms, dcp::NameFormat container_name_format, dcp::NameFormat filename_format, - dcp::NameFormat::Map name_values, string cpl_name ) { @@ -218,31 +208,28 @@ email ( throw NetworkError (_("No mail server configured in preferences")); } - /* No specific screen */ - name_values['s'] = ""; - - BOOST_FOREACH (list const & i, cinema_kdms) { + BOOST_FOREACH (list const & i, kdms) { - if (i.front()->cinema()->emails.empty()) { + if (i.front()->emails().empty()) { continue; } boost::filesystem::path zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path(); boost::filesystem::create_directories (zip_file); - zip_file /= container_name_format.get(name_values, ".zip"); - make_zip_file (i, zip_file, filename_format, name_values); + zip_file /= container_name_format.get(i.front()->name_values(), ".zip"); + make_zip_file (i, zip_file, filename_format); string subject = config->kdm_subject(); boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (subject, "$START_TIME", name_values['b']); - boost::algorithm::replace_all (subject, "$END_TIME", name_values['e']); - boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.front()->cinema()->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("")); string body = config->kdm_email().c_str(); boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (body, "$START_TIME", name_values['b']); - boost::algorithm::replace_all (body, "$END_TIME", name_values['e']); - boost::algorithm::replace_all (body, "$CINEMA_NAME", i.front()->cinema()->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("")); string screens; BOOST_FOREACH (KDMWithMetadataPtr j, i) { @@ -253,7 +240,7 @@ email ( } boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2)); - Emailer email (config->kdm_from(), i.front()->cinema()->emails, subject, body); + Emailer email (config->kdm_from(), i.front()->emails(), subject, body); BOOST_FOREACH (string i, config->kdm_cc()) { email.add_cc (i); @@ -262,7 +249,7 @@ email ( email.add_bcc (config->kdm_bcc ()); } - email.add_attachment (zip_file, container_name_format.get(name_values, ".zip"), "application/zip"); + email.add_attachment (zip_file, container_name_format.get(i.front()->name_values(), ".zip"), "application/zip"); Config* c = Config::instance ();