#include "emailer.h"
#include "compose.hpp"
#include "log.h"
-#include "kdm_name_format.h"
#include <zip.h>
#include <boost/foreach.hpp>
using std::string;
using std::runtime_error;
using boost::shared_ptr;
+using boost::function;
void
-CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_format, dcp::NameFormat::Map name_values) const
+CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
{
int error;
struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
list<shared_ptr<string> > kdm_strings;
- name_values["cinema"] = cinema->name;
+ name_values['c'] = cinema->name;
BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
shared_ptr<string> kdm (new string (i.kdm.as_xml ()));
throw runtime_error ("could not create ZIP source");
}
- name_values["screen"] = i.screen->name;
- string const name = name_format.get(name_values) + ".xml";
+ name_values['s'] = i.screen->name;
+ string const name = name_format.get(name_values, ".xml");
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
}
return cinema_kdms;
}
+/** Write one directory per cinema into another directory */
+int
+CinemaKDMs::write_directories (
+ list<CinemaKDMs> cinema_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 (CinemaKDMs const & i, cinema_kdms) {
+ boost::filesystem::path path = directory;
+ name_values['c'] = i.cinema->name;
+ path /= container_name_format.get(name_values, "");
+ if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
+ boost::filesystem::create_directories (path);
+ ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
+ }
+ written += i.screen_kdms.size();
+ }
+
+ return written;
+}
+
/** Write one ZIP file per cinema into a directory */
-void
+int
CinemaKDMs::write_zip_files (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
- KDMNameFormat name_format,
- dcp::NameFormat::Map name_values
+ 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["screen"] = "";
+ name_values['s'] = "";
+
+ int written = 0;
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
boost::filesystem::path path = directory;
- name_values["cinema"] = i.cinema->name;
- path /= name_format.get(name_values) + ".zip";
- i.make_zip_file (path, name_format, name_values);
+ name_values['c'] = i.cinema->name;
+ path /= container_name_format.get(name_values, ".zip");
+ 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);
+ }
+ i.make_zip_file (path, filename_format, name_values);
+ written += i.screen_kdms.size();
+ }
}
+
+ return written;
}
/** Email one ZIP file per cinema to the cinema.
+ * @param cinema_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.
+ * @param cpl_name Name of the CPL that the KDMs are for.
* @param log Log to write email session transcript to, or 0.
*/
void
CinemaKDMs::email (
list<CinemaKDMs> cinema_kdms,
- KDMNameFormat name_format,
+ dcp::NameFormat container_name_format,
+ dcp::NameFormat filename_format,
dcp::NameFormat::Map name_values,
string cpl_name,
shared_ptr<Log> log
}
/* No specific screen */
- name_values["screen"] = "";
+ name_values['s'] = "";
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
- name_values["cinema"] = i.cinema->name;
+ name_values['c'] = i.cinema->name;
- boost::filesystem::path zip_file = boost::filesystem::temp_directory_path ();
- zip_file /= boost::filesystem::unique_path().string() + ".zip";
- i.make_zip_file (zip_file, name_format, name_values);
+ boost::filesystem::path zip_file = boost::filesystem::temp_directory_path();
+ zip_file /= container_name_format.get(name_values, ".zip");
+ i.make_zip_file (zip_file, filename_format, name_values);
string subject = config->kdm_subject();
boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
- boost::algorithm::replace_all (subject, "$START_TIME", name_values["from"]);
- boost::algorithm::replace_all (subject, "$END_TIME", name_values["to"]);
+ 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.cinema->name);
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["from"]);
- boost::algorithm::replace_all (body, "$END_TIME", name_values["to"]);
+ 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.cinema->name);
- locked_stringstream screens;
+ string screens;
BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
- screens << j.screen->name << ", ";
+ screens += j.screen->name + ", ";
}
- boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
+ boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
Emailer email (config->kdm_from(), i.cinema->emails, subject, body);
email.add_bcc (config->kdm_bcc ());
}
- email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip");
+ email.add_attachment (zip_file, container_name_format.get(name_values, ".zip"), "application/zip");
Config* c = Config::instance ();
projects / dcpomatic.git / blobdiff