using std::make_shared;
-using std::shared_ptr;
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");
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);
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];
}
}
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");
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);
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];
}
}
BOOST_AUTO_TEST_CASE (subtitle_file_naming)
{
- Keep keep;
+ ConfigRestorer cr;
Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));
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
+ });
+}
+