X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=aea058d8048c72f50d969ce5f67385ad1b83f846;hp=a9c93e9acb5bffa16a772bc0570f85e8ea3f171b;hb=bc36ddea65fda2088f7e8fa98390e3feac07df84;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;ds=sidebyside

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index a9c93e9ac..aea058d80 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -92,6 +92,9 @@
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/wxhtml.h>
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
+#endif
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
@@ -444,10 +447,21 @@ public:
 
 		JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
 	}
-	catch (std::exception& e) {
-		wxString p = std_to_wx (file.string ());
-		wxCharBuffer b = p.ToUTF8 ();
-		error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx (e.what()));
+	catch (FileNotFoundError& e) {
+		boost::filesystem::path const dir = e.file().parent_path();
+		if (boost::filesystem::exists(dir / "ASSETMAP") || boost::filesystem::exists(dir / "ASSETMAP.xml")) {
+			error_dialog (
+				this, _("Could not open this folder as a DCP-o-matic project."),
+				_("It looks like you are trying to open a DCP.  File -> Open is for loading DCP-o-matic projects, not DCPs.  To import a DCP, create a new project with File -> New and then click the \"Add DCP...\" button.")
+				);
+		} else {
+			wxString const p = std_to_wx(file.string ());
+			error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
+		}
+
+	} catch (std::exception& e) {
+		wxString const p = std_to_wx (file.string());
+		error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
 	}
 
 	void set_film (shared_ptr<Film> film)
@@ -510,7 +524,7 @@ private:
 			} catch (boost::filesystem::filesystem_error& e) {
 #ifdef DCPOMATIC_WINDOWS
 				string bad_chars = "<>:\"/|?*";
-				string const filename = d->path().string();
+				string const filename = d->path().filename().string();
 				string found_bad_chars;
 				for (size_t i = 0; i < bad_chars.length(); ++i) {
 					if (filename.find(bad_chars[i]) != string::npos && found_bad_chars.find(bad_chars[i]) == string::npos) {
@@ -518,9 +532,11 @@ private:
 					}
 				}
 				wxString message = _("Could not create folder to store film.");
+				message += "  ";
 				if (!found_bad_chars.empty()) {
-					message += "  ";
 					message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data());
+				} else {
+					message += _("Please check that you do not have Windows controlled folder access enabled for DCP-o-matic.");
 				}
 				error_dialog (this, message, std_to_wx(e.what()));
 #else
@@ -811,7 +827,7 @@ private:
 				start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
 			}
 
-			dcpomatic_sleep (1);
+			dcpomatic_sleep_seconds (1);
 		}
 
 		return true;
@@ -873,14 +889,19 @@ private:
 				)
 			);
 
+
+		dcp::LocalTime from (Config::instance()->signer_chain()->leaf().not_before());
+		from.add_minutes (1);
+		dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after());
+		to.add_minutes (-1);
+
 		optional<dcp::EncryptedKDM> kdm;
 		try {
 			kdm = _film->make_kdm (
 				Config::instance()->decryption_chain()->leaf(),
 				vector<string>(),
 				d->cpl (),
-				dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
-				dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
+				from, to,
 				dcp::MODIFIED_TRANSITIONAL_1,
 				true,
 				0
@@ -911,6 +932,18 @@ private:
 	{
 		ExportDialog* d = new ExportDialog (this, _film->isdcf_name(true));
 		if (d->ShowModal() == wxID_OK) {
+			if (boost::filesystem::exists(d->path())) {
+				bool ok = confirm_dialog(
+						this,
+						wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(d->path().string()).data())
+						);
+
+				if (!ok) {
+					d->Destroy ();
+					return;
+				}
+			}
+
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
 			if (d->format() == EXPORT_FORMAT_SUBTITLES_DCP) {
 				job->set_encoder (
@@ -1468,6 +1501,8 @@ static const wxCmdLineEntryDesc command_line_description[] = {
 	{ wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_OPTION, "d", "dcp", "add content DCP", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_SWITCH, "v", "version", "show DCP-o-matic version", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_OPTION, "", "config", "directory containing config.xml and cinemas.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
@@ -1482,7 +1517,11 @@ public:
 		: wxApp ()
 		, _frame (0)
 		, _splash (0)
-	{}
+	{
+#ifdef DCPOMATIC_LINUX
+		XInitThreads ();
+#endif
+	}
 
 private:
 
@@ -1610,6 +1649,11 @@ private:
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser)
 	{
+		if (parser.Found (wxT("version"))) {
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
+			exit (EXIT_SUCCESS);
+		}
+
 		if (parser.GetParamCount() > 0) {
 			if (parser.Found (wxT ("new"))) {
 				_film_to_create = wx_to_std (parser.GetParam (0));
@@ -1628,6 +1672,11 @@ private:
 			_dcp_to_add = wx_to_std (dcp);
 		}
 
+		wxString config;
+		if (parser.Found (wxT("config"), &config)) {
+			State::override_path = wx_to_std (config);
+		}
+
 		return true;
 	}