diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-13 00:24:56 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-13 00:24:56 +0200 |
| commit | 0866fe0a549a489a140fd4670a5245ba231fc8ec (patch) | |
| tree | 9526b17df53acd931a5bf73dbdcfb039632037fe | |
| parent | 5aecb78c66b9c7f6124751af7cbe9c79be32149b (diff) | |
Allow hyphens as part of the "name" part of the ISDCF name.
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | test/isdcf_name_test.cc | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index f26dcaed0..d0a26e44c 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -894,7 +894,7 @@ Film::isdcf_name(bool if_created_now) const /* Split the raw name up into words */ vector<string> words; - split(words, raw_name, is_any_of(" _-")); + split(words, raw_name, is_any_of(" _")); string fixed_name; diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 3bab735ce..b0cc568cd 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -169,6 +169,18 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_name ("LIKE SHOUTING"); BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); + /* And one with underscores */ + + film->set_name("LIKE_SHOUTING"); + BOOST_CHECK_EQUAL(film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); + + /* And one with hyphens */ + + film->set_name("LIKE-SHOUTING"); + BOOST_CHECK_EQUAL(film->isdcf_name(false), "LIKE-SHOUTING_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); + + film->set_name("LIKE_SHOUTING"); + /* Test audio channel markup */ film->set_audio_channels (6); |