Pull methods out of CinemaKDMs.

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

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 3af1e0d84ca7c1ec932c635c9cfa223d32153e2f..d96a95d7f7a96ede71df6e53879a089a406db35b 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -29,6 +29,7 @@
 #include "log.h"
 #include "zipper.h"
 #include "dcpomatic_log.h"
+#include "kdm_with_metadata.h"
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
@@ -39,16 +40,16 @@ using std::string;
 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)
 {
        Zipper zipper (zip_file);
 
-       name_values['c'] = cinema->name;
+       name_values['c'] = kdms.cinema->name;
 
-       BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
-               name_values['s'] = i->screen->name;
+       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());
@@ -57,11 +58,11 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
        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<shared_ptr<ScreenKDM> > screen_kdms)
+collect (list<KDMWithMetadataPtr> screen_kdms)
 {
        list<CinemaKDMs> cinema_kdms;
 
@@ -71,17 +72,17 @@ CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
 
                CinemaKDMs ck;
 
-               list<shared_ptr<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<shared_ptr<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<shared_ptr<ScreenKDM> >::iterator j = i;
+                               list<KDMWithMetadataPtr>::iterator j = i;
                                ++i;
                                screen_kdms.remove (*j);
                        } else {
@@ -97,7 +98,7 @@ CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
 
 /** 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,
@@ -117,7 +118,7 @@ CinemaKDMs::write_directories (
                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);
+                       write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
                }
                written += i.screen_kdms.size();
        }
@@ -127,7 +128,7 @@ CinemaKDMs::write_directories (
 
 /** 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,
@@ -150,7 +151,7 @@ CinemaKDMs::write_zip_files (
                                /* 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();
                }
        }
@@ -166,7 +167,7 @@ CinemaKDMs::write_zip_files (
  *  @param cpl_name Name of the CPL that the KDMs are for.
  */
 void
-CinemaKDMs::email (
+email (
        list<CinemaKDMs> cinema_kdms,
        dcp::NameFormat container_name_format,
        dcp::NameFormat filename_format,
@@ -194,7 +195,7 @@ CinemaKDMs::email (
                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);
@@ -209,8 +210,11 @@ CinemaKDMs::email (
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
                string screens;
-               BOOST_FOREACH (shared_ptr<ScreenKDM> 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));