/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "film.h"
#include "dkdm_wrapper.h"
#include "compose.hpp"
+#include "crypto.h"
#include <dcp/raw_convert.h>
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
using boost::optional;
using boost::dynamic_pointer_cast;
using boost::algorithm::trim;
+using boost::shared_array;
using dcp::raw_convert;
Config* Config::_instance = 0;
_gdc_password = optional<string>();
_interface_complexity = INTERFACE_SIMPLE;
_player_mode = PLAYER_MODE_WINDOW;
+ _image_display = 0;
_respect_kdm_validity_periods = true;
- _player_log_file = boost::none;
+ _player_activity_log_file = boost::none;
+ _player_debug_log_file = boost::none;
+ _player_content_directory = boost::none;
+ _player_playlist_directory = boost::none;
+ _player_kdm_directory = boost::none;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _player_background_image = boost::none;
+ _kdm_server_url = "http://localhost:8000/{CPL}";
+ _player_watermark_theatre = "";
+ _player_watermark_period = 1;
+ _player_watermark_duration = 50;
+ _player_lock_file = boost::none;
+ _signer_chain_path = "signer";
+ _decryption_chain_path = "decryption";
+#endif
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
Config::read ()
try
{
+#if defined(DCPOMATIC_VARIANT_SWAROOP) && defined(DCPOMATIC_LINUX)
+ if (geteuid() == 0) {
+ /* Take ownership of the config file if we're root */
+ chown (config_file().string().c_str(), 0, 0);
+ chmod (config_file().string().c_str(), 0644);
+ }
+#endif
+
cxml::Document f ("Config");
f.read_file (config_file ());
}
cxml::NodePtr signer = f.optional_node_child ("Signer");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (signer && signer->node_children().size() == 1) {
+ /* The content of <Signer> is a path to a file; if it's relative it's in the same
+ directory as .config. */
+ _signer_chain_path = signer->content();
+ if (_signer_chain_path.is_relative()) {
+ _signer_chain = read_swaroop_chain (path(_signer_chain_path.string()));
+ } else {
+ _signer_chain = read_swaroop_chain (_signer_chain_path);
+ }
+ } else {
+ /* <Signer> is not present or has children: ignore it and remake. */
+ _signer_chain = create_certificate_chain ();
+ }
+#else
if (signer) {
shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
/* Read the signing certificates and private key in from the config file */
/* Make a new set of signing certificates and key */
_signer_chain = create_certificate_chain ();
}
+#endif
/* These must be done before we call BadSignerChain as that might set one
of the nags.
}
cxml::NodePtr decryption = f.optional_node_child ("Decryption");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (decryption && decryption->node_children().size() == 1) {
+ /* The content of <Decryption> is a path to a file; if it's relative, it's in the same
+ directory as .config. */
+ _decryption_chain_path = decryption->content();
+ if (_decryption_chain_path.is_relative()) {
+ _decryption_chain = read_swaroop_chain (path(_decryption_chain_path.string()));
+ } else {
+ _decryption_chain = read_swaroop_chain (_decryption_chain_path);
+ }
+ } else {
+ /* <Decryption> is not present or has more children: ignore it and remake. */
+ _decryption_chain = create_certificate_chain ();
+ }
+#else
if (decryption) {
shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
} else {
_decryption_chain = create_certificate_chain ();
}
-
+#endif
if (f.optional_node_child("DKDMGroup")) {
/* New-style: all DKDMs in a group */
_dkdms = dynamic_pointer_cast<DKDMGroup> (DKDMBase::read (f.node_child("DKDMGroup")));
_player_mode = PLAYER_MODE_DUAL;
}
+ _image_display = f.optional_number_child<int>("ImageDisplay").get_value_or(0);
_respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true);
- _player_log_file = f.optional_string_child("PlayerLogFile");
+ /* PlayerLogFile is old name */
+ _player_activity_log_file = f.optional_string_child("PlayerLogFile");
+ if (!_player_activity_log_file) {
+ _player_activity_log_file = f.optional_string_child("PlayerActivityLogFile");
+ }
+ _player_debug_log_file = f.optional_string_child("PlayerDebugLogFile");
+ _player_content_directory = f.optional_string_child("PlayerContentDirectory");
+ _player_playlist_directory = f.optional_string_child("PlayerPlaylistDirectory");
+ _player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _player_background_image = f.optional_string_child("PlayerBackgroundImage");
+ _kdm_server_url = f.optional_string_child("KDMServerURL").get_value_or("http://localhost:8000/{CPL}");
+ _player_watermark_theatre = f.optional_string_child("PlayerWatermarkTheatre").get_value_or("");
+ _player_watermark_period = f.optional_number_child<int>("PlayerWatermarkPeriod").get_value_or(1);
+ _player_watermark_duration = f.optional_number_child<int>("PlayerWatermarkDuration").get_value_or(150);
+ BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("RequiredMonitor")) {
+ _required_monitors.push_back(Monitor(i));
+ }
+ _player_lock_file = f.optional_string_child("PlayerLockFile");
+#endif
/* Replace any cinemas from config.xml with those from the configured file */
if (boost::filesystem::exists (_cinemas_file)) {
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Config");
- /* [XML] Version The version number of the configuration file format */
+ /* [XML] Version The version number of the configuration file format. */
root->add_child("Version")->add_child_text (String::compose ("%1", _current_version));
/* [XML] MasterEncodingThreads Number of encoding threads to use when running as master. */
root->add_child("MasterEncodingThreads")->add_child_text (raw_convert<string> (_master_encoding_threads));
root->add_child("OnlyServersEncode")->add_child_text (_only_servers_encode ? "1" : "0");
/* [XML] TMSProtocol Protocol to use to copy files to a TMS; 0 to use SCP, 1 for FTP. */
root->add_child("TMSProtocol")->add_child_text (raw_convert<string> (static_cast<int> (_tms_protocol)));
- /* [XML] TMSIP IP address of TMS */
+ /* [XML] TMSIP IP address of TMS. */
root->add_child("TMSIP")->add_child_text (_tms_ip);
- /* [XML] TMSPath Path on the TMS to copy files to */
+ /* [XML] TMSPath Path on the TMS to copy files to. */
root->add_child("TMSPath")->add_child_text (_tms_path);
- /* [XML] TMSUser Username to log into the TMS with */
+ /* [XML] TMSUser Username to log into the TMS with. */
root->add_child("TMSUser")->add_child_text (_tms_user);
- /* [XML] TMSPassword Password to log into the TMS with */
+ /* [XML] TMSPassword Password to log into the TMS with. */
root->add_child("TMSPassword")->add_child_text (_tms_password);
if (_cinema_sound_processor) {
/* [XML:opt] CinemaSoundProcessor Identifier of the type of cinema sound processor to use when calculating
}
if (_default_container) {
/* [XML:opt] DefaultContainer ID of default container
- * to use when creating new films (<code>185</code>,<code>239</code> or
- * <code>190</code>).
+ to use when creating new films (<code>185</code>,<code>239</code> or
+ <code>190</code>).
*/
root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
}
root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
/* [XML] DCPIssuer Creator text to write into CPL files. */
root->add_child("DCPCreator")->add_child_text (_dcp_creator);
+ /* [XML] DefaultUploadAfterMakeDCP 1 to default to uploading to a TMS after making a DCP, 0 to default to no upload. */
root->add_child("DefaultUploadAfterMakeDCP")->add_child_text (_default_upload_after_make_dcp ? "1" : "0");
/* [XML] ISDCFMetadata Default ISDCF metadata to use for new films; child tags are <code><ContentVersion></code>,
/* [XML] KDMCC CC address to use for KDM emails; you can use as many of these tags as you like. */
root->add_child("KDMCC")->add_child_text (i);
}
- /* [XML] KDMBCC BCC address to use for KDM emails */
+ /* [XML] KDMBCC BCC address to use for KDM emails. */
root->add_child("KDMBCC")->add_child_text (_kdm_bcc);
- /* [XML] KDMEmail Text of KDM email */
+ /* [XML] KDMEmail Text of KDM email. */
root->add_child("KDMEmail")->add_child_text (_kdm_email);
- /* [XML] NotificationSubject Subject to use for Notification emails. */
+ /* [XML] NotificationSubject Subject to use for notification emails. */
root->add_child("NotificationSubject")->add_child_text (_notification_subject);
- /* [XML] NotificationFrom From address to use for Notification emails. */
+ /* [XML] NotificationFrom From address to use for notification emails. */
root->add_child("NotificationFrom")->add_child_text (_notification_from);
- /* [XML] NotificationFrom To address to use for Notification emails. */
+ /* [XML] NotificationFrom To address to use for notification emails. */
root->add_child("NotificationTo")->add_child_text (_notification_to);
BOOST_FOREACH (string i, _notification_cc) {
- /* [XML] NotificationCC CC address to use for Notification emails; you can use as many of these tags as you like. */
+ /* [XML] NotificationCC CC address to use for notification emails; you can use as many of these tags as you like. */
root->add_child("NotificationCC")->add_child_text (i);
}
- /* [XML] NotificationBCC BCC address to use for Notification emails */
+ /* [XML] NotificationBCC BCC address to use for notification emails. */
root->add_child("NotificationBCC")->add_child_text (_notification_bcc);
- /* [XML] NotificationEmail Text of Notification email */
+ /* [XML] NotificationEmail Text of notification email. */
root->add_child("NotificationEmail")->add_child_text (_notification_email);
- /* [XML] CheckForUpdates 1 to check dcpomatic.com for new versions, 0 to check only on request */
+ /* [XML] CheckForUpdates 1 to check dcpomatic.com for new versions, 0 to check only on request. */
root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0");
- /* [XML] CheckForUpdates 1 to check dcpomatic.com for new text versions, 0 to check only on request */
+ /* [XML] CheckForUpdates 1 to check dcpomatic.com for new text versions, 0 to check only on request. */
root->add_child("CheckForTestUpdates")->add_child_text (_check_for_test_updates ? "1" : "0");
- /* [XML] MaximumJ2KBandwidth Maximum J2K bandwidth (in bits per second) that can be specified in the GUI */
+ /* [XML] MaximumJ2KBandwidth Maximum J2K bandwidth (in bits per second) that can be specified in the GUI. */
root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
- /* [XML] AllowAnyDCPFrameRate 1 to allow users to specify any frame rate when creating DCPs, 0 to limit the GUI to standard rates */
+ /* [XML] AllowAnyDCPFrameRate 1 to allow users to specify any frame rate when creating DCPs, 0 to limit the GUI to standard rates. */
root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
- /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers */
+ /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers. */
root->add_child("AllowAnyContainer")->add_child_text (_allow_any_container ? "1" : "0");
/* [XML] LogTypes Types of logging to write; a bitfield where 1 is general notes, 2 warnings, 4 errors, 8 debug information related
to encoding, 16 debug information related to encoding, 32 debug information for timing purposes, 64 debug information related
root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
#endif
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (_signer_chain_path.is_relative()) {
+ write_swaroop_chain (_signer_chain, path(_signer_chain_path.string()));
+ } else {
+ write_swaroop_chain (_signer_chain, _signer_chain_path);
+ }
+ root->add_child("Signer")->add_child_text(_signer_chain_path.string());
+#else
/* [XML] Signer Certificate chain and private key to use when signing DCPs and KDMs. Should contain <code><Certificate></code>
tags in order and a <code><PrivateKey></code> tag all containing PEM-encoded certificates or private keys as appropriate.
*/
signer->add_child("Certificate")->add_child_text (i.certificate (true));
}
signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ());
+#endif
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (_decryption_chain_path.is_relative()) {
+ write_swaroop_chain (_decryption_chain, path(_decryption_chain_path.string()));
+ } else {
+ write_swaroop_chain (_decryption_chain, _decryption_chain_path);
+ }
+ root->add_child("Decryption")->add_child_text(_decryption_chain_path.string());
+#else
/* [XML] Decryption Certificate chain and private key to use when decrypting KDMs */
xmlpp::Element* decryption = root->add_child ("Decryption");
DCPOMATIC_ASSERT (_decryption_chain);
decryption->add_child("Certificate")->add_child_text (i.certificate (true));
}
decryption->add_child("PrivateKey")->add_child_text (_decryption_chain->key().get ());
+#endif
/* [XML] History Filename of DCP to present in the <guilabel>File</guilabel> menu of the GUI; there can be more than one
of these tags.
root->add_child("History")->add_child_text (i.string ());
}
+ /* [XML] History Filename of DCP to present in the <guilabel>File</guilabel> menu of the player; there can be more than one
+ of these tags.
+ */
BOOST_FOREACH (boost::filesystem::path i, _player_history) {
root->add_child("PlayerHistory")->add_child_text (i.string ());
}
/* [XML] DKDM A DKDM as XML */
_dkdms->as_xml (root);
- /* [XML] CinemasFile Filename of cinemas list file */
+ /* [XML] CinemasFile Filename of cinemas list file. */
root->add_child("CinemasFile")->add_child_text (_cinemas_file.string());
- /* [XML] ShowHintsBeforeMakeDCP 1 to show hints in the GUI before making a DCP, otherwise 0 */
+ /* [XML] ShowHintsBeforeMakeDCP 1 to show hints in the GUI before making a DCP, otherwise 0. */
root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0");
- /* [XML] ConfirmKDMEmail 1 to confirm before sending KDM emails in the GUI, otherwise 0 */
+ /* [XML] ConfirmKDMEmail 1 to confirm before sending KDM emails in the GUI, otherwise 0. */
root->add_child("ConfirmKDMEmail")->add_child_text (_confirm_kdm_email ? "1" : "0");
- /* [XML] KDMFilenameFormat Format for KDM filenames */
+ /* [XML] KDMFilenameFormat Format for KDM filenames. */
root->add_child("KDMFilenameFormat")->add_child_text (_kdm_filename_format.specification ());
- /* [XML] KDMContainerNameFormat Format for KDM containers (directories or ZIP files) */
+ /* [XML] KDMContainerNameFormat Format for KDM containers (directories or ZIP files). */
root->add_child("KDMContainerNameFormat")->add_child_text (_kdm_container_name_format.specification ());
- /* [XML] DCPMetadataFilenameFormat Format for DCP metadata filenames */
+ /* [XML] DCPMetadataFilenameFormat Format for DCP metadata filenames. */
root->add_child("DCPMetadataFilenameFormat")->add_child_text (_dcp_metadata_filename_format.specification ());
- /* [XML] DCPAssetFilenameFormat Format for DCP asset filenames */
+ /* [XML] DCPAssetFilenameFormat Format for DCP asset filenames. */
root->add_child("DCPAssetFilenameFormat")->add_child_text (_dcp_asset_filename_format.specification ());
- /* [XML] JumpToSelected 1 to make the GUI jump to the start of content when it is selected, otherwise 0 */
+ /* [XML] JumpToSelected 1 to make the GUI jump to the start of content when it is selected, otherwise 0. */
root->add_child("JumpToSelected")->add_child_text (_jump_to_selected ? "1" : "0");
- /* [XML] Nagged 1 if a particular nag screen has been shown and should not be shown again, otherwise 0 */
+ /* [XML] Nagged 1 if a particular nag screen has been shown and should not be shown again, otherwise 0. */
for (int i = 0; i < NAG_COUNT; ++i) {
xmlpp::Element* e = root->add_child ("Nagged");
e->set_attribute ("Id", raw_convert<string>(i));
e->add_child_text (_nagged[i] ? "1" : "0");
}
- /* [XML] PreviewSound 1 to use sound in the GUI preview and player, otherwise 0 */
+ /* [XML] PreviewSound 1 to use sound in the GUI preview and player, otherwise 0. */
root->add_child("PreviewSound")->add_child_text (_sound ? "1" : "0");
if (_sound_output) {
- /* [XML:opt] PreviewSoundOutput Name of the audio output to use */
+ /* [XML:opt] PreviewSoundOutput Name of the audio output to use. */
root->add_child("PreviewSoundOutput")->add_child_text (_sound_output.get());
}
- /* [XML] CoverSheet Text of the cover sheet to write when making DCPs */
+ /* [XML] CoverSheet Text of the cover sheet to write when making DCPs. */
root->add_child("CoverSheet")->add_child_text (_cover_sheet);
if (_last_player_load_directory) {
root->add_child("LastPlayerLoadDirectory")->add_child_text(_last_player_load_directory->string());
}
+ /* [XML] LastKDMWriteType Last type of KDM-write: <code>flat</code> for a flat file, <code>folder</code> for a folder or <code>zip</code> for a ZIP file. */
if (_last_kdm_write_type) {
switch (_last_kdm_write_type.get()) {
case KDM_WRITE_FLAT:
break;
}
}
+ /* [XML] LastDKDMWriteType Last type of DKDM-write: <code>file</code> for a file, <code>internal</code> to add to DCP-o-matic's list. */
if (_last_dkdm_write_type) {
switch (_last_dkdm_write_type.get()) {
case DKDM_WRITE_INTERNAL:
*/
root->add_child("FramesInMemoryMultiplier")->add_child_text(raw_convert<string>(_frames_in_memory_multiplier));
- /* [XML] DecodeReduction power of 2 to reduce DCP images by before decoding in the player */
+ /* [XML] DecodeReduction power of 2 to reduce DCP images by before decoding in the player. */
if (_decode_reduction) {
root->add_child("DecodeReduction")->add_child_text(raw_convert<string>(_decode_reduction.get()));
}
- /* [XML] DefaultNotify 1 to default jobs to notify when complete, otherwise 0 */
+ /* [XML] DefaultNotify 1 to default jobs to notify when complete, otherwise 0. */
root->add_child("DefaultNotify")->add_child_text(_default_notify ? "1" : "0");
- /* [XML] Notification 1 if a notification type is enabled, otherwise 0 */
+ /* [XML] Notification 1 if a notification type is enabled, otherwise 0. */
for (int i = 0; i < NOTIFICATION_COUNT; ++i) {
xmlpp::Element* e = root->add_child ("Notification");
e->set_attribute ("Id", raw_convert<string>(i));
}
if (_barco_username) {
+ /* [XML] BarcoUsername Username for logging into Barco's servers when downloading server certificates. */
root->add_child("BarcoUsername")->add_child_text(*_barco_username);
}
if (_barco_password) {
+ /* [XML] BarcoPassword Password for logging into Barco's servers when downloading server certificates. */
root->add_child("BarcoPassword")->add_child_text(*_barco_password);
}
if (_christie_username) {
+ /* [XML] ChristieUsername Username for logging into Christie's servers when downloading server certificates. */
root->add_child("ChristieUsername")->add_child_text(*_christie_username);
}
if (_christie_password) {
+ /* [XML] ChristiePassword Password for logging into Christie's servers when downloading server certificates. */
root->add_child("ChristiePassword")->add_child_text(*_christie_password);
}
if (_gdc_username) {
+ /* [XML] GCCUsername Username for logging into GDC's servers when downloading server certificates. */
root->add_child("GDCUsername")->add_child_text(*_gdc_username);
}
if (_gdc_password) {
+ /* [XML] GCCPassword Password for logging into GDC's servers when downloading server certificates. */
root->add_child("GDCPassword")->add_child_text(*_gdc_password);
}
+ /* [XML] InterfaceComplexity <code>simple</code> for the reduced interface or <code>full</code> for the full interface. */
switch (_interface_complexity) {
case INTERFACE_SIMPLE:
root->add_child("InterfaceComplexity")->add_child_text("simple");
break;
}
+ /* [XML] PlayerMode <code>window</code> for a single window, <code>full</code> for full-screen and <code>dual</code> for full screen playback
+ with controls on another monitor.
+ */
switch (_player_mode) {
case PLAYER_MODE_WINDOW:
root->add_child("PlayerMode")->add_child_text("window");
break;
}
+ /* [XML] ImageDisplay Screen number to put image on in dual-screen player mode. */
+ root->add_child("ImageDisplay")->add_child_text(raw_convert<string>(_image_display));
+ /* [XML] RespectKDMValidityPeriods 1 to refuse to use KDMs that are out of date, 0 to ignore KDM dates. */
root->add_child("RespectKDMValidityPeriods")->add_child_text(_respect_kdm_validity_periods ? "1" : "0");
- if (_player_log_file) {
- root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string());
+ if (_player_activity_log_file) {
+ /* [XML] PlayerLogFile Filename to use for player activity logs (e.g starting, stopping, playlist loads) */
+ root->add_child("PlayerActivityLogFile")->add_child_text(_player_activity_log_file->string());
+ }
+ if (_player_debug_log_file) {
+ /* [XML] PlayerLogFile Filename to use for player debug logs */
+ root->add_child("PlayerDebugLogFile")->add_child_text(_player_debug_log_file->string());
+ }
+ if (_player_content_directory) {
+ /* [XML] PlayerContentDirectory Directory to use for player content in the dual-screen mode. */
+ root->add_child("PlayerContentDirectory")->add_child_text(_player_content_directory->string());
}
+ if (_player_playlist_directory) {
+ /* [XML] PlayerPlaylistDirectory Directory to use for player playlists in the dual-screen mode. */
+ root->add_child("PlayerPlaylistDirectory")->add_child_text(_player_playlist_directory->string());
+ }
+ if (_player_kdm_directory) {
+ /* [XML] PlayerKDMDirectory Directory to use for player KDMs in the dual-screen mode. */
+ root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
+ }
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (_player_background_image) {
+ root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
+ }
+ root->add_child("KDMServerURL")->add_child_text(_kdm_server_url);
+ root->add_child("PlayerWatermarkTheatre")->add_child_text(_player_watermark_theatre);
+ root->add_child("PlayerWatermarkPeriod")->add_child_text(raw_convert<string>(_player_watermark_period));
+ root->add_child("PlayerWatermarkDuration")->add_child_text(raw_convert<string>(_player_watermark_duration));
+ BOOST_FOREACH (Monitor i, _required_monitors) {
+ i.as_xml(root->add_child("RequiredMonitor"));
+ }
+ if (_player_lock_file) {
+ root->add_child("PlayerLockFile")->add_child_text(_player_lock_file->string());
+ }
+#endif
try {
- doc.write_to_file_formatted(config_file().string());
+ string const s = doc.write_to_string_formatted ();
+ boost::filesystem::path tmp (string(config_file().string()).append(".tmp"));
+ FILE* f = fopen_boost (tmp, "w");
+ if (!f) {
+ throw FileError (_("Could not open file for writing"), tmp);
+ }
+ checked_fwrite (s.c_str(), s.length(), f, tmp);
+ fclose (f);
+ boost::filesystem::remove (config_file());
+ boost::filesystem::rename (tmp, config_file());
} catch (xmlpp::exception& e) {
string s = e.what ();
trim (s);
- throw FileError (s, path("config.xml"));
+ throw FileError (s, config_file());
}
}
}
try {
- doc.write_to_file_formatted (_cinemas_file.string ());
+ doc.write_to_file_formatted (_cinemas_file.string() + ".tmp");
+ boost::filesystem::remove (_cinemas_file);
+ boost::filesystem::rename (_cinemas_file.string() + ".tmp", _cinemas_file);
} catch (xmlpp::exception& e) {
string s = e.what ();
trim (s);
h.pop_back ();
}
- changed ();
+ changed (HISTORY);
}
bool
}
/* See if there's a link */
- f.read_file (main);
- optional<string> link = f.optional_string_child("Link");
- if (link) {
- return *link;
+ try {
+ f.read_file (main);
+ optional<string> link = f.optional_string_child("Link");
+ if (link) {
+ return *link;
+ }
+ } catch (xmlpp::exception& e) {
+ /* There as a problem reading the main configuration file,
+ so there can't be a link.
+ */
}
return main;
boost::filesystem::copy_file (config_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
link (new_file);
}
+
+bool
+Config::have_write_permission () const
+{
+ FILE* f = fopen_boost (config_file(), "r+");
+ if (!f) {
+ return false;
+ }
+
+ fclose (f);
+ return true;
+}
projects / dcpomatic.git / blobdiff