Restrict name part of ISDCF name more (#2920).

This disallows + and . from the name part of an ISDCF name.
I'm not 100% convinced about +, but . seems reasonable.

This also fixes the case where you do "copy as name" with
a name that should be transliterated, and the non-transliterated
characters re-appear.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 1ac519011ac970635232065b8b508bedce48c838..ebbdfe013edc545ff02efb079a92e26e4799c5ba 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -920,7 +920,7 @@ Film::isdcf_name (bool if_created_now) const
 
        fixed_name = fixed_name.substr(0, Config::instance()->isdcf_name_part_length());
 
-       isdcf_name += fixed_name;
+       isdcf_name += careful_string_filter(fixed_name, L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-");
 
        if (dcp_content_type()) {
                isdcf_name += "_" + dcp_content_type()->isdcf_name();