#include "config.h"
#include "dcpomatic_log.h"
#include "emailer.h"
-#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <boost/function.hpp>
using std::string;
using std::cout;
using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using boost::function;
int
write_files (
- list<KDMWithMetadataPtr> screen_kdms,
+ list<KDMWithMetadataPtr> kdms,
boost::filesystem::path directory,
dcp::NameFormat name_format,
- dcp::NameFormat::Map name_values,
boost::function<bool (boost::filesystem::path)> confirm_overwrite
)
{
if (directory == "-") {
/* Write KDMs to the stdout */
- BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
+ for (auto i: kdms) {
cout << i->kdm_as_xml ();
++written;
}
}
/* Write KDMs to the specified directory */
- BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
- name_values['i'] = i->kdm_id ();
- boost::filesystem::path out = directory / careful_string_filter(name_format.get(name_values, ".xml"));
+ for (auto i: kdms) {
+ 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;
void
-make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
+make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format)
{
Zipper zipper (zip_file);
- BOOST_FOREACH (KDMWithMetadataPtr i, kdms) {
- name_values['i'] = i->kdm_id ();
- string const name = careful_string_filter(name_format.get(name_values, ".xml"));
+ for (auto i: kdms) {
+ string const name = careful_string_filter(name_format.get(i->name_values(), ".xml"));
zipper.add (name, i->kdm_as_xml());
}
}
-/** Collect a list of KDMWithMetadatas into a list of list<KDMWithMetadata> so that each
- * CinemaKDM contains the KDMs for its cinema.
+/** Collect a list of KDMWithMetadatas into a list of lists so that
+ * each list contains the KDMs for one list.
*/
list<list<KDMWithMetadataPtr> >
-collect (list<KDMWithMetadataPtr> screen_kdms)
+collect (list<KDMWithMetadataPtr> kdms)
{
- list<list<KDMWithMetadataPtr> > cinema_kdms;
+ list<list<KDMWithMetadataPtr> > grouped;
- while (!screen_kdms.empty ()) {
+ for (auto i: kdms) {
- /* Get all the screens from a single cinema */
+ list<list<KDMWithMetadataPtr> >::iterator j = grouped.begin ();
- list<KDMWithMetadataPtr> ck;
-
- list<KDMWithMetadataPtr>::iterator i = screen_kdms.begin ();
- ck.push_back (*i);
- list<KDMWithMetadataPtr>::iterator j = i;
- ++i;
- screen_kdms.remove (*j);
-
- while (i != screen_kdms.end ()) {
- if ((*i)->cinema() == ck.front()->cinema()) {
- ck.push_back (*i);
- list<KDMWithMetadataPtr>::iterator j = i;
- ++i;
- screen_kdms.remove (*j);
- } else {
- ++i;
+ while (j != grouped.end()) {
+ if (j->front()->group() == i->group()) {
+ j->push_back (i);
+ break;
}
+ ++j;
}
- cinema_kdms.push_back (ck);
+ if (j == grouped.end()) {
+ grouped.push_back (list<KDMWithMetadataPtr>());
+ grouped.back().push_back (i);
+ }
}
- return cinema_kdms;
+ return grouped;
}
-/** Write one directory per cinema into another directory */
+/** Write one directory per list into another directory */
int
write_directories (
- list<list<KDMWithMetadataPtr> > cinema_kdms,
+ list<list<KDMWithMetadataPtr> > kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- dcp::NameFormat::Map name_values,
function<bool (boost::filesystem::path)> confirm_overwrite
)
{
- /* No specific screen */
- name_values['s'] = "";
-
int written = 0;
- BOOST_FOREACH (list<KDMWithMetadataPtr> const & i, cinema_kdms) {
+ for (auto 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();
}
/** Write one ZIP file per cinema into a directory */
int
write_zip_files (
- list<list<KDMWithMetadataPtr> > cinema_kdms,
+ list<list<KDMWithMetadataPtr> > kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- dcp::NameFormat::Map name_values,
function<bool (boost::filesystem::path)> confirm_overwrite
)
{
- /* No specific screen */
- name_values['s'] = "";
-
int written = 0;
- BOOST_FOREACH (list<KDMWithMetadataPtr> const & i, cinema_kdms) {
+ for (auto 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();
}
}
/** 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.
*/
void
email (
- list<list<KDMWithMetadataPtr> > cinema_kdms,
+ list<list<KDMWithMetadataPtr> > kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- dcp::NameFormat::Map name_values,
string cpl_name
)
{
throw NetworkError (_("No mail server configured in preferences"));
}
- /* No specific screen */
- name_values['s'] = "";
-
- BOOST_FOREACH (list<KDMWithMetadataPtr> const & i, cinema_kdms) {
+ for (auto 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) {
+ for (auto j: i) {
optional<string> screen_name = j->get('n');
if (screen_name) {
screens += *screen_name + ", ";
}
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()) {
+ for (auto i: config->kdm_cc()) {
email.add_cc (i);
}
if (!config->kdm_bcc().empty ()) {
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 ();
projects / dcpomatic.git / blobdiff