Supporters update.

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 0b76952a8a72e61e83a34e8febd32823495cd590..1b5871bd2c80d008dbc738a9fa1a885066fdefc4 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -27,9 +27,10 @@
 
 #include "test.h"
 #include "lib/config.h"
-#include "lib/film.h"
-#include "lib/ffmpeg_content.h"
+#include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/video_content.h"
 #ifdef DCPOMATIC_WINDOWS
 #include <boost/locale.hpp>
@@ -38,32 +39,26 @@
 #include <boost/regex.hpp>
 
 
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::string;
 
 
-class Keep
-{
-public:
-       Keep ()
-       {
-               _format = Config::instance()->dcp_asset_filename_format ();
-       }
-
-       ~Keep ()
-       {
-               Config::instance()->set_dcp_asset_filename_format (_format);
-       }
-
-private:
-       dcp::NameFormat _format;
+static
+string
+mxf_regex(string part) {
+#ifdef DCPOMATIC_WINDOWS
+       /* Windows replaces . in filenames with _ */
+       return String::compose(".*flat_%1_png_.*\\.mxf", part);
+#else
+       return String::compose(".*flat_%1\\.png_.*\\.mxf", part);
+#endif
 };
 
 
+
 BOOST_AUTO_TEST_CASE (file_naming_test)
 {
-       Keep k;
+       ConfigRestorer cr;
        Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat("%c"));
 
        auto film = new_test_film ("file_naming_test");
@@ -79,13 +74,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -99,11 +94,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
        int got[3] = { 0, 0, 0 };
        for (auto i: boost::filesystem::directory_iterator(film->file(film->dcp_name()))) {
-               if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("red")))) {
                        ++got[0];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("green")))) {
                        ++got[1];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("blue")))) {
                        ++got[2];
                }
        }
@@ -116,7 +111,8 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
 BOOST_AUTO_TEST_CASE (file_naming_test2)
 {
-       Keep k;
+       ConfigRestorer cr;
+
        Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
 
        auto film = new_test_film ("file_naming_test2");
@@ -138,13 +134,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -157,11 +153,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
 
        int got[3] = { 0, 0, 0 };
        for (auto i: boost::filesystem::directory_iterator (film->file(film->dcp_name()))) {
-               if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("red")))) {
                        ++got[0];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("green")))) {
                        ++got[1];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("blue")))) {
                        ++got[2];
                }
        }
@@ -170,3 +166,54 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
                BOOST_CHECK (got[i] == 2);
        }
 }
+
+
+BOOST_AUTO_TEST_CASE (subtitle_file_naming)
+{
+       ConfigRestorer cr;
+
+       Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));
+
+       auto content = content_factory("test/data/15s.srt");
+       auto film = new_test_film2("subtitle_file_naming", content);
+       film->set_interop(false);
+
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+                       dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+                       dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+               });
+
+       int got = 0;
+
+       for (auto i: boost::filesystem::directory_iterator(film->file(film->dcp_name()))) {
+               if (boost::regex_match(i.path().filename().string(), boost::regex("sub_ostrabagalous_15s.*\\.mxf"))) {
+                       ++got;
+               }
+       }
+
+       BOOST_CHECK_EQUAL(got, 1);
+}
+
+
+BOOST_AUTO_TEST_CASE(remove_bad_characters_from_template)
+{
+       ConfigRestorer cr;
+
+       /* %z is not recognised, so the % should be discarded so it won't trip
+        * an invalid URI check in make_and_verify_dcp
+        */
+       Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%c%z"));
+
+       auto content = content_factory("test/data/flat_red.png");
+       auto film = new_test_film2("remove_bad_characters_from_template", content);
+       make_and_verify_dcp(
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+                       dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+               });
+}
+