ChangeLog.

[dcpomatic.git] / src / lib / kdm.cc

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index cebbfffd14d43a2d9f14ba7c8cf2fc3ae8007358..cf551285bb5444a476bd5b5f319b3ac556f056fd 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -31,6 +31,7 @@
 
 using std::list;
 using std::string;
+using std::stringstream;
 using boost::shared_ptr;
 
 struct ScreenKDM
@@ -45,7 +46,7 @@ struct ScreenKDM
 };
 
 static string
-kdm_filename (shared_ptr<Film> film, ScreenKDM kdm)
+kdm_filename (shared_ptr<const Film> film, ScreenKDM kdm)
 {
        return tidy_for_filename (film->name()) + "_" + tidy_for_filename (kdm.screen->cinema->name) + "_" + tidy_for_filename (kdm.screen->name) + ".kdm.xml";
 }
@@ -55,7 +56,7 @@ struct CinemaKDMs
        shared_ptr<Cinema> cinema;
        list<ScreenKDM> screen_kdms;
 
-       void make_zip_file (shared_ptr<Film> film, boost::filesystem::path zip_file) const
+       void make_zip_file (shared_ptr<const Film> film, boost::filesystem::path zip_file) const
        {
                int error;
                struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
@@ -98,9 +99,15 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 }
 
 static list<ScreenKDM>
-make_screen_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+make_screen_kdms (
+       shared_ptr<const Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<libdcp::KDM> kdms = film->make_kdms (screens, from, to);
+       list<libdcp::KDM> kdms = film->make_kdms (screens, dcp, from, to);
           
        list<ScreenKDM> screen_kdms;
        
@@ -116,9 +123,15 @@ make_screen_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boos
 }
 
 static list<CinemaKDMs>
-make_cinema_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+make_cinema_kdms (
+       shared_ptr<const Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, from, to);
+       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
        list<CinemaKDMs> cinema_kdms;
 
        while (!screen_kdms.empty ()) {
@@ -153,10 +166,15 @@ make_cinema_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boos
 
 void
 write_kdm_files (
-       shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to, boost::filesystem::path directory
+       shared_ptr<const Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to,
+       boost::filesystem::path directory
        )
 {
-       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, from, to);
+       list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
 
        /* Write KDMs to the specified directory */
        for (list<ScreenKDM>::iterator i = screen_kdms.begin(); i != screen_kdms.end(); ++i) {
@@ -168,10 +186,15 @@ write_kdm_files (
 
 void
 write_kdm_zip_files (
-       shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to, boost::filesystem::path directory
+       shared_ptr<const Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to,
+       boost::filesystem::path directory
        )
 {
-       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, from, to);
+       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
 
        for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
                boost::filesystem::path path = directory;
@@ -181,9 +204,15 @@ write_kdm_zip_files (
 }
 
 void
-email_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::posix_time::ptime from, boost::posix_time::ptime to)
+email_kdms (
+       shared_ptr<const Film> film,
+       list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
+       boost::posix_time::ptime from,
+       boost::posix_time::ptime to
+       )
 {
-       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, from, to);
+       list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
 
        for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
                
@@ -198,14 +227,30 @@ email_kdms (shared_ptr<Film> film, list<shared_ptr<Screen> > screens, boost::pos
                quickmail_add_to (mail, i->cinema->email.c_str ());
                
                string body = Config::instance()->kdm_email().c_str();
-               boost::algorithm::replace_all (body, "$DCP_NAME", film->dcp_name ());
-               
+               boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
+               stringstream start;
+               start << from.date() << " " << from.time_of_day();
+               boost::algorithm::replace_all (body, "$START_TIME", start.str ());
+               stringstream end;
+               end << to.date() << " " << to.time_of_day();
+               boost::algorithm::replace_all (body, "$END_TIME", end.str ());
+
                quickmail_set_body (mail, body.c_str());
-               quickmail_add_attachment_file (mail, zip_file.string().c_str());
-               char const* error = quickmail_send (mail, Config::instance()->mail_server().c_str(), 25, "", "");
+               quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
+
+               int const port = Config::instance()->mail_user().empty() ? 25 : 587;
+
+               char const* error = quickmail_send (
+                       mail,
+                       Config::instance()->mail_server().c_str(),
+                       port,
+                       Config::instance()->mail_user().c_str(),
+                       Config::instance()->mail_password().c_str()
+                       );
+               
                if (error) {
                        quickmail_destroy (mail);
-                       throw StringError (String::compose ("Failed to send KDM email (%1)", error));
+                       throw KDMError (String::compose ("Failed to send KDM email (%1)", error));
                }
                quickmail_destroy (mail);
        }