X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_disk.cc;h=1907a604522149e1b642ee84022d4ef2fea6ccb2;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=d3a28cdc41c917045f64bd5bdbc544bcb5a4b613;hpb=402fa9a3577975e9cf9728c815da1b17796fe325;p=dcpomatic.git diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index d3a28cdc4..1907a6045 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2020 Carl Hetherington + Copyright (C) 2019-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,24 +18,27 @@ */ -#include "wx/wx_signal_manager.h" -#include "wx/wx_util.h" -#include "wx/job_manager_view.h" + +#include "wx/disk_warning_dialog.h" #include "wx/drive_wipe_warning_dialog.h" -#include "wx/try_unmount_dialog.h" +#include "wx/job_manager_view.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" +#include "wx/try_unmount_dialog.h" +#include "wx/wx_util.h" +#include "wx/wx_signal_manager.h" +#include "wx/wx_util.h" #include "lib/config.h" -#include "lib/signal_manager.h" -#include "lib/cross.h" #include "lib/copy_to_drive_job.h" -#include "lib/job_manager.h" +#include "lib/cross.h" +#include "lib/dcpomatic_log.h" #include "lib/disk_writer_messages.h" +#include "lib/file_log.h" +#include "lib/job_manager.h" +#include "lib/signal_manager.h" +#include "lib/util.h" #include "lib/version.h" #include "lib/warnings.h" +#include #include DCPOMATIC_DISABLE_WARNINGS #include @@ -47,11 +50,13 @@ DCPOMATIC_ENABLE_WARNINGS #include #endif -using std::string; -using std::exception; -using std::cout; + using std::cerr; -using boost::shared_ptr; +using std::cout; +using std::exception; +using std::make_shared; +using std::shared_ptr; +using std::string; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -69,13 +74,13 @@ class DOMFrame : public wxFrame { public: explicit DOMFrame (wxString const & title) - : wxFrame (0, -1, title) + : wxFrame (nullptr, wxID_ANY, title) , _nanomsg (true) , _sizer (new wxBoxSizer(wxVERTICAL)) { #ifdef DCPOMATIC_OSX - wxMenuBar* bar = new wxMenuBar; - wxMenu* tools = new wxMenu; + auto bar = new wxMenuBar; + auto tools = new wxMenu; tools->Append(ID_tools_uninstall, _("Uninstall...")); bar->Append(tools, _("Tools")); SetMenuBar (bar); @@ -85,16 +90,16 @@ public: /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ - wxPanel* overall_panel = new wxPanel (this); - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto overall_panel = new wxPanel (this); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (overall_panel, 1, wxEXPAND); SetSizer (s); - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); int r = 0; add_label_to_sizer (grid, overall_panel, _("DCP"), true, wxGBPosition(r, 0)); - wxBoxSizer* dcp_name_sizer = new wxBoxSizer (wxHORIZONTAL); + auto dcp_name_sizer = new wxBoxSizer (wxHORIZONTAL); _dcp_name = new wxStaticText (overall_panel, wxID_ANY, wxEmptyString); dcp_name_sizer->Add (_dcp_name, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_X_GAP); _dcp_open = new wxButton (overall_panel, wxID_ANY, _("Open...")); @@ -103,7 +108,7 @@ public: ++r; add_label_to_sizer (grid, overall_panel, _("Drive"), true, wxGBPosition(r, 0)); - wxBoxSizer* drive_sizer = new wxBoxSizer (wxHORIZONTAL); + auto drive_sizer = new wxBoxSizer (wxHORIZONTAL); _drive = new wxChoice (overall_panel, wxID_ANY); drive_sizer->Add (_drive, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_X_GAP); _drive_refresh = new wxButton (overall_panel, wxID_ANY, _("Refresh")); @@ -134,7 +139,7 @@ public: /* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's * a better place to put them. */ - dcpomatic_log.reset(new FileLog(config_path() / "disk.log")); + dcpomatic_log = make_shared(State::write_path("disk.log")); dcpomatic_log->set_types (dcpomatic_log->types() | LogEntry::TYPE_DISK); LOG_DISK("dcpomatic_disk %1 started", dcpomatic_git_commit); @@ -169,6 +174,21 @@ public: ~DOMFrame () { _nanomsg.send(DISK_WRITER_QUIT "\n", 2000); + /* This seems really horrible but it's suggested by the examples on nanomsg.org, so... + * Without this the quit is not received (at least sometimes) causing #2018. + */ + dcpomatic_sleep_seconds (1); + } + + void set_dcp (boost::filesystem::path dcp) + { + if (!boost::filesystem::exists(dcp / "ASSETMAP") && !boost::filesystem::exists(dcp / "ASSETMAP.xml")) { + error_dialog (nullptr, _("No ASSETMAP or ASSETMAP.xml found in this folder. Please choose a DCP folder.")); + return; + } + + _dcp_path = dcp; + _dcp_name->SetLabel (std_to_wx(dcp.filename().string())); } private: @@ -193,7 +213,7 @@ private: return true; } - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("There are unfinished jobs; are you sure you want to quit?"), _("Unfinished jobs"), @@ -219,7 +239,7 @@ private: void open () { - wxDirDialog* d = new wxDirDialog (this, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); + auto d = new wxDirDialog (this, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); int r = d->ShowModal (); boost::filesystem::path const path (wx_to_std(d->GetPath())); d->Destroy (); @@ -228,29 +248,50 @@ private: return; } - _dcp_path = path; - _dcp_name->SetLabel (std_to_wx(_dcp_path->filename().string())); + set_dcp (path); setup_sensitivity (); } void copy () { + /* Check that the selected drive still exists and update its properties if so */ + drive_refresh (); + if (_drive->GetSelection() == wxNOT_FOUND) { + error_dialog (this, _("The disk you selected is no longer available. Please choose another.")); + return; + } + 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; + auto ping = [this](int attempt) { + if (_nanomsg.send(DISK_WRITER_PING "\n", 1000)) { + auto reply = _nanomsg.receive (1000); + if (reply && *reply == DISK_WRITER_PONG) { + return true; + } else if (reply) { + LOG_DISK("Unexpected response %1 to ping received (attempt %2)", *reply, attempt); + } else { + LOG_DISK("No reply received from ping (attempt %1)", attempt); + } + } else { + LOG_DISK("Could not send ping to writer (attempt %1)", attempt); + } + dcpomatic_sleep_seconds (1); + return false; + }; + + bool have_writer = false; + for (int i = 0; i < 8; ++i) { + if (ping(i + 1)) { + have_writer = true; + break; } } if (!have_writer) { -#ifdef DCPOMATIC_WINDOWS - MessageDialog* m = new MessageDialog ( +#if defined(DCPOMATIC_WINDOWS) + auto 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.") @@ -258,14 +299,24 @@ private: m->ShowModal (); m->Destroy (); return; +#elif defined(DCPOMATIC_OSX) + auto m = new MessageDialog ( + this, + _("DCP-o-matic Disk Writer"), + _("Did you install the DCP-o-matic Disk Writer.pkg from the .dmg? Please check and try again.") + ); + m->ShowModal (); + m->Destroy (); + return; #else + LOG_DISK_NC ("Failed to ping writer"); throw CommunicationFailedError (); #endif } - Drive const& drive = _drives[_drive->GetSelection()]; + auto const& drive = _drives[_drive->GetSelection()]; if (drive.mounted()) { - TryUnmountDialog* d = new TryUnmountDialog(this, drive.description()); + auto d = new TryUnmountDialog(this, drive.description()); int const r = d->ShowModal (); d->Destroy (); if (r != wxID_OK) { @@ -274,14 +325,17 @@ private: LOG_DISK("Sending unmount request to disk writer for %1", drive.as_xml()); if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) { + LOG_DISK_NC("Failed to send unmount request."); throw CommunicationFailedError (); } if (!_nanomsg.send(drive.as_xml(), 2000)) { + LOG_DISK_NC("Failed to send drive for unmount request."); throw CommunicationFailedError (); } - optional reply = _nanomsg.receive (2000); + /* The reply may have to wait for the user to authenticate, so let's wait a while */ + auto reply = _nanomsg.receive (30000); if (!reply || *reply != DISK_WRITER_OK) { - MessageDialog* m = new MessageDialog ( + auto * 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())) @@ -293,7 +347,7 @@ private: } - DriveWipeWarningDialog* d = new DriveWipeWarningDialog (this, _drive->GetString(_drive->GetSelection())); + auto * d = new DriveWipeWarningDialog (this, _drive->GetString(_drive->GetSelection())); int const r = d->ShowModal (); bool ok = r == wxID_OK && d->confirmed(); d->Destroy (); @@ -302,7 +356,7 @@ private: return; } - JobManager::instance()->add(shared_ptr(new CopyToDriveJob(*_dcp_path, _drives[_drive->GetSelection()], _nanomsg))); + JobManager::instance()->add(make_shared(*_dcp_path, _drives[_drive->GetSelection()], _nanomsg)); setup_sensitivity (); } @@ -317,8 +371,8 @@ private: int re_select = wxNOT_FOUND; int j = 0; _drives = Drive::get (); - BOOST_FOREACH (Drive i, _drives) { - wxString const s = std_to_wx(i.description()); + for (auto i: _drives) { + auto const s = std_to_wx(i.description()); if (s == current) { re_select = j; } @@ -349,14 +403,22 @@ private: wxSizer* _sizer; }; + +static const wxCmdLineEntryDesc command_line_description[] = { + { wxCMD_LINE_OPTION, "d", "dcp", "DCP to write", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_SWITCH, "s", "sure", "skip alpha test warnings", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } +}; + + class App : public wxApp { public: App () - : _frame (0) + : _frame (nullptr) {} - bool OnInit () + bool OnInit () override { try { Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); @@ -397,18 +459,24 @@ public: */ Config::drop (); - DiskWarningDialog* warning = new DiskWarningDialog (); - warning->ShowModal (); - if (!warning->confirmed()) { - return false; + if (!_skip_alpha_check) { + auto warning = new DiskWarningDialog (); + warning->ShowModal (); + if (!warning->confirmed()) { + return false; + } + warning->Destroy (); } - warning->Destroy (); _frame = new DOMFrame (_("DCP-o-matic Disk Writer")); SetTopWindow (_frame); _frame->Show (); + if (_dcp_to_write) { + _frame->set_dcp (*_dcp_to_write); + } + signal_manager = new wxSignalManager (this); Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1)); } @@ -421,6 +489,24 @@ public: return true; } + void OnInitCmdLine (wxCmdLineParser& parser) override + { + parser.SetDesc (command_line_description); + parser.SetSwitchChars (wxT ("-")); + } + + bool OnCmdLineParsed (wxCmdLineParser& parser) override + { + _skip_alpha_check = parser.Found(wxT("sure")); + + wxString dcp; + if (parser.Found(wxT("dcp"), &dcp)) { + _dcp_to_write = wx_to_std (dcp); + } + + return true; + } + void config_failed_to_load () { message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); @@ -463,19 +549,21 @@ public: } } - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { report_exception (); /* This will terminate the program */ return false; } - void OnUnhandledException () + void OnUnhandledException () override { report_exception (); } DOMFrame* _frame; + bool _skip_alpha_check = false; + boost::optional _dcp_to_write; }; IMPLEMENT_APP (App)