Add size and audio/subtitle languages to contact sheet.

diff --git a/ChangeLog b/ChangeLog
index 119c6e360e58b1d3aa413b926b1ee5fab27e9c14..25bce37ca63a281d0ac776b749cff6f3bb0ca104 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-06-08  Carl Hetherington  <cth@carlh.net>
 
+       * Add size and audio/subtitle languages to cover sheet (#1081).
+
        * Updated de_DE translation from Carsten Kurz.
 
 2017-06-05  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 7b2e29f15ce065a1e9b366a4897256ab943f8351..8dd4c4e0bb984321f94a5026bb2931a2beb5a24f 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -634,7 +634,10 @@ Config::set_cover_sheet_to_default ()
                "Type: $TYPE\n"
                "Format: $CONTAINER\n"
                "Audio: $AUDIO\n"
+               "Audio Language: $AUDIO_LANGUAGE\n"
+               "Subtitle Language: $SUBTITLE_LANGUAGE\n"
                "Length: $LENGTH\n"
+               "Size: $SIZE\n"
                );
 }
 

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index ec4689b2ff7025317aaefff3615ee2f0c001549b..ae00c0122478f6d721ffa23d51dd128d8d37e603 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -35,6 +35,7 @@
 #include "util.h"
 #include "reel_writer.h"
 #include <dcp/cpl.h>
+#include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
 #include <fstream>
 #include <cerrno>
@@ -556,6 +557,22 @@ Writer::write_cover_sheet ()
        boost::algorithm::replace_all (text, "$CPL_NAME", _film->name());
        boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name());
        boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->nickname());
+       boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language);
+       boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language);
+
+       boost::uintmax_t size = 0;
+       for (
+               boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(_film->dir(_film->dcp_name()));
+               i != boost::filesystem::recursive_directory_iterator();
+               ++i) {
+               size += boost::filesystem::file_size (i->path ());
+       }
+
+       if (size > (1000000000L)) {
+               boost::algorithm::replace_all (text, "$SIZE", String::compose ("%1GB", dcp::locale_convert<string> (size / 1000000000.0, 1, true)));
+       } else {
+               boost::algorithm::replace_all (text, "$SIZE", String::compose ("%1MB", dcp::locale_convert<string> (size / 1000000.0, 1, true)));
+       }
 
        pair<int, int> ch = audio_channel_types (_film->mapped_audio_channels(), _film->audio_channels());
        string description = String::compose("%1.%2", ch.first, ch.second);