Tidy up careful_string_filter and add some extra transliterations.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index d11a60c94f8ac8be7a2f4682a63716c0577db4cf..3661d8ba58268b85d0d606ea6e1b8123b19e449b 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -78,6 +78,7 @@ boost::signals2::signal<bool (Config::BadReason)> Config::Bad;
 Config::Config ()
         /* DKDMs are not considered a thing to reset on set_defaults() */
        : _dkdms (new DKDMGroup ("root"))
+       , _default_kdm_duration (1, RoughDuration::Unit::WEEKS)
 {
        set_defaults ();
 }
@@ -188,6 +189,7 @@ Config::set_defaults ()
        _write_kdms_to_disk = true;
        _email_kdms = false;
        _default_kdm_type = dcp::Formulation::MODIFIED_TRANSITIONAL_1;
+       _default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS);
        _auto_crop_threshold = 0.1;
 
        _allowed_dcp_frame_rates.clear ();
@@ -580,6 +582,11 @@ try
        _write_kdms_to_disk = f.optional_bool_child("WriteKDMsToDisk").get_value_or(true);
        _email_kdms = f.optional_bool_child("EmailKDMs").get_value_or(false);
        _default_kdm_type = dcp::string_to_formulation(f.optional_string_child("DefaultKDMType").get_value_or("modified-transitional-1"));
+       if (auto duration = f.optional_node_child("DefaultKDMDuration")) {
+               _default_kdm_duration = RoughDuration(duration);
+       } else {
+               _default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS);
+       }
        _auto_crop_threshold = f.optional_number_child<double>("AutoCropThreshold").get_value_or(0.1);
 
        if (boost::filesystem::exists (_cinemas_file)) {
@@ -725,6 +732,7 @@ Config::write_config () const
                /* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */
                root->add_child("DefaultKDMDirectory")->add_child_text (_default_kdm_directory->string ());
        }
+       _default_kdm_duration.as_xml(root->add_child("DefaultKDMDuration"));
        /* [XML] MailServer Hostname of SMTP server to use. */
        root->add_child("MailServer")->add_child_text (_mail_server);
        /* [XML] MailPort Port number to use on SMTP server. */
@@ -1023,12 +1031,12 @@ Config::write_config () const
        try {
                auto const s = doc.write_to_string_formatted ();
                boost::filesystem::path tmp (string(target.string()).append(".tmp"));
-               auto f = fopen_boost (tmp, "w");
+               dcp::File f(tmp, "w");
                if (!f) {
                        throw FileError (_("Could not open file for writing"), tmp);
                }
-               checked_fwrite (s.c_str(), s.bytes(), f, tmp);
-               fclose (f);
+               f.checked_write(s.c_str(), s.bytes());
+               f.close();
                boost::filesystem::remove (target);
                boost::filesystem::rename (tmp, target);
        } catch (xmlpp::exception& e) {
@@ -1162,6 +1170,7 @@ Config::set_cover_sheet_to_default ()
 {
        _cover_sheet = _(
                "$CPL_NAME\n\n"
+               "CPL Filename: $CPL_FILENAME\n"
                "Type: $TYPE\n"
                "Format: $CONTAINER\n"
                "Audio: $AUDIO\n"
@@ -1407,13 +1416,8 @@ Config::copy_and_link (boost::filesystem::path new_file) const
 bool
 Config::have_write_permission () const
 {
-       auto f = fopen_boost (config_write_file(), "r+");
-       if (!f) {
-               return false;
-       }
-
-       fclose (f);
-       return true;
+       dcp::File f(config_write_file(), "r+");
+       return static_cast<bool>(f);
 }
 
 /** @param  output_channels Number of output channels in use.