#include "emailer.h"
#include "compose.hpp"
#include "log.h"
-#include <zip.h>
+#include "zipper.h"
+#include "dcpomatic_log.h"
+#include "kdm_with_metadata.h"
#include <boost/foreach.hpp>
#include "i18n.h"
using std::runtime_error;
using boost::shared_ptr;
using boost::function;
+using boost::optional;
void
-CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
+make_zip_file (CinemaKDMs kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
{
- int error;
- struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
- if (!zip) {
- if (error == ZIP_ER_EXISTS) {
- throw FileError ("ZIP file already exists", zip_file);
- }
- throw FileError ("could not create ZIP file", zip_file);
- }
-
- list<shared_ptr<string> > kdm_strings;
-
- name_values['c'] = cinema->name;
-
- BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
- shared_ptr<string> kdm (new string (i.kdm.as_xml ()));
- kdm_strings.push_back (kdm);
+ Zipper zipper (zip_file);
- struct zip_source* source = zip_source_buffer (zip, kdm->c_str(), kdm->length(), 0);
- if (!source) {
- throw runtime_error ("could not create ZIP source");
- }
+ name_values['c'] = kdms.cinema->name;
- name_values['s'] = i.screen->name;
- name_values['i'] = i.kdm.id ();
- 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");
- }
+ BOOST_FOREACH (KDMWithMetadataPtr i, kdms.screen_kdms) {
+ name_values['i'] = i->kdm_id ();
+ string const name = careful_string_filter(name_format.get(name_values, ".xml"));
+ zipper.add (name, i->kdm_as_xml());
}
- if (zip_close (zip) == -1) {
- throw runtime_error ("failed to close ZIP archive");
- }
+ zipper.close ();
}
-/** Collect a list of ScreenKDMs into a list of CinemaKDMs so that each
+/** Collect a list of KDMWithMetadatas into a list of CinemaKDMs so that each
* CinemaKDM contains the KDMs for its cinema.
*/
list<CinemaKDMs>
-CinemaKDMs::collect (list<ScreenKDM> screen_kdms)
+collect (list<KDMWithMetadataPtr> screen_kdms)
{
list<CinemaKDMs> cinema_kdms;
CinemaKDMs ck;
- list<ScreenKDM>::iterator i = screen_kdms.begin ();
- ck.cinema = i->screen->cinema;
+ list<KDMWithMetadataPtr>::iterator i = screen_kdms.begin ();
+ ck.cinema = (*i)->cinema();
ck.screen_kdms.push_back (*i);
- list<ScreenKDM>::iterator j = i;
+ list<KDMWithMetadataPtr>::iterator j = i;
++i;
screen_kdms.remove (*j);
while (i != screen_kdms.end ()) {
- if (i->screen->cinema == ck.cinema) {
+ if ((*i)->cinema() == ck.cinema) {
ck.screen_kdms.push_back (*i);
- list<ScreenKDM>::iterator j = i;
+ list<KDMWithMetadataPtr>::iterator j = i;
++i;
screen_kdms.remove (*j);
} else {
/** Write one directory per cinema into another directory */
int
-CinemaKDMs::write_directories (
+write_directories (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
int written = 0;
- if (!boost::filesystem::exists (directory)) {
- boost::filesystem::create_directories (directory);
- }
-
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, "");
- ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
+ if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
+ boost::filesystem::create_directories (path);
+ write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
+ }
written += i.screen_kdms.size();
}
/** Write one ZIP file per cinema into a directory */
int
-CinemaKDMs::write_zip_files (
+write_zip_files (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
int written = 0;
- if (!boost::filesystem::exists (directory)) {
- boost::filesystem::create_directories (directory);
- }
-
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
boost::filesystem::path path = directory;
name_values['c'] = i.cinema->name;
/* 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);
+ make_zip_file (i, path, filename_format, name_values);
written += i.screen_kdms.size();
}
}
* @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 (
+email (
list<CinemaKDMs> cinema_kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
dcp::NameFormat::Map name_values,
- string cpl_name,
- shared_ptr<Log> log
+ string cpl_name
)
{
Config* config = Config::instance ();
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
+ if (i.cinema->emails.empty()) {
+ continue;
+ }
+
name_values['c'] = i.cinema->name;
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");
- i.make_zip_file (zip_file, filename_format, name_values);
+ make_zip_file (i, zip_file, filename_format, name_values);
string subject = config->kdm_subject();
boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
string screens;
- BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
- screens += j.screen->name + ", ";
+ BOOST_FOREACH (KDMWithMetadataPtr j, i.screen_kdms) {
+ 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));
Config* c = Config::instance ();
try {
- email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
+ email.send (c->mail_server(), c->mail_port(), c->mail_protocol(), c->mail_user(), c->mail_password());
} catch (...) {
boost::filesystem::remove (zip_file);
- if (log) {
- log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
- log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
- log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
- log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
- }
+ dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
throw;
}
boost::filesystem::remove (zip_file);
- if (log) {
- log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
- log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
- log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
- log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
- }
+ dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
}
}
projects / dcpomatic.git / blobdiff