X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_disk.cc;h=1a3c3d5fe78d4f71f0099aa6b9a1d151850e2ace;hb=bed96d486f85a9fa5171e2cdaa3858581d631b3a;hp=6dbfbe4b036791565092179ed59db5d13758b44e;hpb=350afcbc40fffd8c8780180e153a2ee91088f562;p=dcpomatic.git diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 6dbfbe4b0..1a3c3d5fe 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -24,6 +24,7 @@ #include "wx/drive_wipe_warning_dialog.h" #include "wx/try_unmount_dialog.h" #include "wx/message_dialog.h" +#include "wx/disk_warning_dialog.h" #include "lib/file_log.h" #include "lib/dcpomatic_log.h" #include "lib/util.h" @@ -33,13 +34,17 @@ #include "lib/copy_to_drive_job.h" #include "lib/job_manager.h" #include "lib/disk_writer_messages.h" +#include "lib/version.h" +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS #include #endif #ifdef DCPOMATIC_OSX -#include +#include #endif using std::string; @@ -48,6 +53,17 @@ using std::cout; using std::cerr; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + +#ifdef DCPOMATIC_OSX +enum { + ID_tools_uninstall = 1, +}; +#endif + class DOMFrame : public wxFrame { @@ -57,6 +73,15 @@ public: , _nanomsg (true) , _sizer (new wxBoxSizer(wxVERTICAL)) { +#ifdef DCPOMATIC_OSX + wxMenuBar* bar = new wxMenuBar; + wxMenu* tools = new wxMenu; + tools->Append(ID_tools_uninstall, _("Uninstall...")); + bar->Append(tools, _("Tools")); + SetMenuBar (bar); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::uninstall, this), ID_tools_uninstall); +#endif + /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ @@ -111,11 +136,12 @@ public: */ dcpomatic_log.reset(new FileLog(config_path() / "disk.log")); dcpomatic_log->set_types (dcpomatic_log->types() | LogEntry::TYPE_DISK); - LOG_DISK_NC("dcpomatic_disk started"); + LOG_DISK("dcpomatic_disk %1 started", dcpomatic_git_commit); drive_refresh (); - Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1)); + Bind (wxEVT_SIZE, boost::bind(&DOMFrame::sized, this, _1)); + Bind (wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1)); JobManager::instance()->ActiveJobsChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this)); @@ -126,11 +152,18 @@ public: #endif #ifdef DCPOMATIC_LINUX - LOG_DISK("Starting writer process %1", disk_writer_path().string()); - _writer = new boost::process::child (disk_writer_path()); + if (getenv("DCPOMATIC_NO_START_WRITER")) { + LOG_DISK_NC("Not starting writer process as DCPOMATIC_NO_START_WRITER is set"); + } else { + LOG_DISK("Starting writer process %1", disk_writer_path().string()); + _writer = new boost::process::child (disk_writer_path()); + } #endif - /* _writer is always running on macOS at the moment */ +#ifdef DCPOMATIC_OSX + LOG_DISK_NC("Sending notification to writer daemon"); + notify_post ("com.dcpomatic.disk.writer.start"); +#endif } ~DOMFrame () @@ -145,6 +178,45 @@ private: ev.Skip (); } + +#ifdef DCPOMATIC_OSX + void uninstall() + { + system(String::compose("osascript \"%1/uninstall_disk.applescript\"", resources_path().string()).c_str()); + } +#endif + + + bool should_close () + { + if (!JobManager::instance()->work_to_do()) { + return true; + } + + wxMessageDialog* d = new wxMessageDialog ( + 0, + _("There are unfinished jobs; are you sure you want to quit?"), + _("Unfinished jobs"), + wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION + ); + + bool const r = d->ShowModal() == wxID_YES; + d->Destroy (); + return r; + } + + + void close (wxCloseEvent& ev) + { + if (!should_close()) { + ev.Veto (); + return; + } + + ev.Skip (); + } + + void open () { wxDirDialog* d = new wxDirDialog (this, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); @@ -166,33 +238,61 @@ private: DCPOMATIC_ASSERT (_drive->GetSelection() != wxNOT_FOUND); DCPOMATIC_ASSERT (static_cast(_dcp_path)); + bool have_writer = true; + if (!_nanomsg.send(DISK_WRITER_PING "\n", 2000)) { + have_writer = false; + } else { + optional reply = _nanomsg.receive (2000); + if (!reply || *reply != DISK_WRITER_PONG) { + have_writer = false; + } + } + + if (!have_writer) { +#ifdef DCPOMATIC_WINDOWS + MessageDialog* m = new MessageDialog ( + this, + _("DCP-o-matic Disk Writer"), + _("Do you see a 'User Account Control' dialogue asking about dcpomatic2_disk_writer.exe? If so, click 'Yes', then try again.") + ); + m->ShowModal (); + m->Destroy (); + return; +#else + throw CommunicationFailedError (); +#endif + } + Drive const& drive = _drives[_drive->GetSelection()]; if (drive.mounted()) { TryUnmountDialog* d = new TryUnmountDialog(this, drive.description()); int const r = d->ShowModal (); d->Destroy (); - if (r == wxID_OK) { - if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) { - throw CommunicationFailedError (); - } - if (!_nanomsg.send(drive.internal_name() + "\n", 2000)) { - throw CommunicationFailedError (); - } - optional reply = _nanomsg.receive (2000); - if (!reply || *reply != DISK_WRITER_OK) { - MessageDialog* m = new MessageDialog ( - this, - _("DCP-o-matic Disk Writer"), - wxString::Format(_("The drive %s could not be unmounted.\nClose any application that is using it, then try again."), std_to_wx(drive.description())) - ); - m->ShowModal (); - m->Destroy (); - return; - } + if (r != wxID_OK) { + return; + } + + LOG_DISK("Sending unmount request to disk writer for %1", drive.as_xml()); + if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) { + throw CommunicationFailedError (); + } + if (!_nanomsg.send(drive.as_xml(), 2000)) { + throw CommunicationFailedError (); + } + optional reply = _nanomsg.receive (2000); + if (!reply || *reply != DISK_WRITER_OK) { + MessageDialog* m = new MessageDialog ( + this, + _("DCP-o-matic Disk Writer"), + wxString::Format(_("The drive %s could not be unmounted.\nClose any application that is using it, then try again."), std_to_wx(drive.description())) + ); + m->ShowModal (); + m->Destroy (); + return; } } - + DriveWipeWarningDialog* d = new DriveWipeWarningDialog (this, _drive->GetString(_drive->GetSelection())); int const r = d->ShowModal (); bool ok = r == wxID_OK && d->confirmed(); @@ -216,7 +316,7 @@ private: _drive->Clear (); int re_select = wxNOT_FOUND; int j = 0; - _drives = get_drives (); + _drives = Drive::get (); BOOST_FOREACH (Drive i, _drives) { wxString const s = std_to_wx(i.description()); if (s == current) { @@ -242,7 +342,9 @@ private: JobManagerView* _jobs; boost::optional _dcp_path; std::vector _drives; +#ifndef DCPOMATIC_OSX boost::process::child* _writer; +#endif Nanomsg _nanomsg; wxSizer* _sizer; }; @@ -270,10 +372,9 @@ public: unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + dcpomatic_sleep_seconds (1); + make_foreground_application (); #endif dcpomatic_setup_path_encoding (); @@ -296,6 +397,13 @@ public: */ Config::drop (); + DiskWarningDialog* warning = new DiskWarningDialog (); + warning->ShowModal (); + if (!warning->confirmed()) { + return false; + } + warning->Destroy (); + _frame = new DOMFrame (_("DCP-o-matic Disk Writer")); SetTopWindow (_frame); @@ -307,6 +415,7 @@ public: catch (exception& e) { error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); + return false; } return true; @@ -328,6 +437,44 @@ public: ev.Skip (); } + void report_exception () + { + try { + throw; + } catch (FileError& e) { + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM, + std_to_wx (e.what()), + std_to_wx (e.file().string().c_str ()) + ) + ); + } catch (exception& e) { + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s.\n\n") + REPORT_PROBLEM, + std_to_wx (e.what ()) + ) + ); + } catch (...) { + error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); + } + } + + bool OnExceptionInMainLoop () + { + report_exception (); + /* This will terminate the program */ + return false; + } + + void OnUnhandledException () + { + report_exception (); + } + DOMFrame* _frame; };