Use exceptions to handle errors in the KDM CLI.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 0b7f632e1ef409613c11263ba8cc78e89c06b7e4..a273d008b11948e56aeaba42d784c59bbf08a42e 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -799,7 +799,7 @@ private:
                           a long time, and crashes/power failures are moderately likely.
                        */
                        _film->write_metadata ();
-                       _film->make_dcp (true);
+                       _film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
                } catch (BadSettingError& e) {
                        error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
                } catch (std::exception& e) {
@@ -993,7 +993,7 @@ private:
                                }
                        }
 
-                       auto job = make_shared<TranscodeJob>(_film);
+                       auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
                        job->set_encoder (
                                make_shared<FFmpegEncoder> (
                                        _film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
@@ -1008,7 +1008,7 @@ private:
        {
                auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop());
                if (d->ShowModal() == wxID_OK) {
-                       auto job = make_shared<TranscodeJob>(_film);
+                       auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
                        job->set_encoder (
                                make_shared<SubtitleEncoder>(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font())
                                );
@@ -1101,8 +1101,17 @@ private:
                                body += i.first + "\n" + i.second + "\n\n";
                        }
                        list<string> to = { "carl@dcpomatic.com" };
-                       Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
-                       emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
+                       if (d->email().find("@") == string::npos) {
+                               error_dialog (this, _("You must enter a valid email address when sending translations, "
+                                                     "otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions."));
+                       } else {
+                               Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
+                               try {
+                                       emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
+                               } catch (NetworkError& e) {
+                                       error_dialog (this, _("Could not send translations"), std_to_wx(e.what()));
+                               }
+                       }
                }
 
                d->Destroy ();