X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=38770f4e3214f6d30d10c5f94e4567d38e6b6fd3;hb=36e42b01e3209f0e80dde2ac3813ca71cc605b6f;hp=6a1f2b2848049dd088ebf8b12e1e750d1cfb519d;hpb=513947df0f421c086ac56dff48dfe540b0a380c2;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 6a1f2b284..38770f4e3 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -53,6 +53,7 @@ extern "C" {
 #include <glib.h>
 #include <pangomm/init.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/range/algorithm/replace_if.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #ifdef DCPOMATIC_WINDOWS
@@ -422,7 +423,7 @@ digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 	while (i < int64_t (files.size()) && to_do > 0) {
 		FILE* f = fopen_boost (files[i], "rb");
 		if (!f) {
-			throw OpenFileError (files[i].string(), errno);
+			throw OpenFileError (files[i].string(), errno, true);
 		}
 
 		boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
@@ -442,7 +443,7 @@ digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 	while (i >= 0 && to_do > 0) {
 		FILE* f = fopen_boost (files[i], "rb");
 		if (!f) {
-			throw OpenFileError (files[i].string(), errno);
+			throw OpenFileError (files[i].string(), errno, true);
 		}
 
 		boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
@@ -485,8 +486,7 @@ audio_channel_name (int c)
 	DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
 
 	/// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	/// enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
-	/// VI is the visually-impaired audio track (audio describe).
+	/// enhancement channel (sub-woofer).
 	string const channels[] = {
 		_("Left"),
 		_("Right"),
@@ -509,6 +509,38 @@ audio_channel_name (int c)
 	return channels[c];
 }
 
+string
+short_audio_channel_name (int c)
+{
+	DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
+
+	/// TRANSLATORS: these are short names of audio channels; Lfe is the low-frequency
+	/// enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
+	/// VI is the visually-impaired audio track (audio describe).  DBP is the D-BOX
+	/// primary channel and DBS is the D-BOX secondary channel.
+	string const channels[] = {
+		_("L"),
+		_("R"),
+		_("C"),
+		_("Lfe"),
+		_("Ls"),
+		_("Rs"),
+		_("HI"),
+		_("VI"),
+		_("Lc"),
+		_("Rc"),
+		_("BsL"),
+		_("BsR"),
+		_("DBP"),
+		_("DBS"),
+		"",
+		""
+	};
+
+	return channels[c];
+}
+
+
 bool
 valid_image_file (boost::filesystem::path f)
 {
@@ -525,6 +557,18 @@ valid_image_file (boost::filesystem::path f)
 		);
 }
 
+bool
+valid_sound_file (boost::filesystem::path f)
+{
+	if (boost::starts_with (f.leaf().string(), "._")) {
+		return false;
+	}
+
+	string ext = f.extension().string();
+	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+	return (ext == ".wav" || ext == ".mp3" || ext == ".aif" || ext == ".aiff");
+}
+
 bool
 valid_j2k_file (boost::filesystem::path f)
 {
@@ -536,16 +580,8 @@ valid_j2k_file (boost::filesystem::path f)
 string
 tidy_for_filename (string f)
 {
-	string t;
-	for (size_t i = 0; i < f.length(); ++i) {
-		if (isalnum (f[i]) || f[i] == '_' || f[i] == '-') {
-			t += f[i];
-		} else {
-			t += '_';
-		}
-	}
-
-	return t;
+	boost::replace_if (f, boost::is_any_of ("\\/:"), '_');
+	return f;
 }
 
 dcp::Size
@@ -622,7 +658,7 @@ video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int r
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
-		values['c'] = summary.get();
+		values['c'] = careful_string_filter (summary.get());
 	}
 	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
@@ -635,7 +671,7 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
-		values['c'] = summary.get();
+		values['c'] = careful_string_filter (summary.get());
 	}
 	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
@@ -652,8 +688,21 @@ relaxed_string_to_float (string s)
 	}
 }
 
-bool
-string_not_empty (string s)
+string
+careful_string_filter (string s)
 {
-	return !s.empty ();
+	/* Filter out `bad' characters which `may' cause problems with some systems (either for DCP name or filename).
+	   There's no apparent list of what really is allowed, so this is a guess.
+	   Safety first and all that.
+	*/
+
+	string out;
+	string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.";
+	for (size_t i = 0; i < s.size(); ++i) {
+		if (allowed.find (s[i]) != string::npos) {
+			out += s[i];
+		}
+	}
+
+	return out;
 }