#include "wx/disk_warning_dialog.h"
#include "wx/drive_wipe_warning_dialog.h"
+#include "wx/editable_list.h"
#include "wx/job_manager_view.h"
#include "wx/message_dialog.h"
#include "wx/try_unmount_dialog.h"
#include "lib/signal_manager.h"
#include "lib/util.h"
#include "lib/version.h"
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
+#include <wx/cmdline.h>
#include <wx/wx.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <boost/process.hpp>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#ifdef DCPOMATIC_WINDOWS
#include <boost/process/windows.hpp>
#endif
using std::make_shared;
using std::shared_ptr;
using std::string;
+using std::vector;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
+class DirDialogWrapper : public wxDirDialog
+{
+public:
+ DirDialogWrapper (wxWindow* parent)
+ : wxDirDialog (parent, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST)
+ {
+
+ }
+
+ boost::optional<boost::filesystem::path> get () const
+ {
+ auto const dcp = boost::filesystem::path(wx_to_std(GetPath()));
+ 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 {};
+ }
+
+ return dcp;
+ }
+
+ void set (boost::filesystem::path)
+ {
+ /* Not used */
+ }
+};
+
+
class DOMFrame : public wxFrame
{
public:
int r = 0;
add_label_to_sizer (grid, overall_panel, _("DCP"), true, wxGBPosition(r, 0));
- 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..."));
- dcp_name_sizer->Add (_dcp_open, 0);
- grid->Add (dcp_name_sizer, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+ auto dcp_sizer = new wxBoxSizer (wxHORIZONTAL);
+ auto dcps = new EditableList<boost::filesystem::path, DirDialogWrapper>(
+ overall_panel,
+ { EditableListColumn(_("DCP"), 300, true) },
+ boost::bind(&DOMFrame::dcp_paths, this),
+ boost::bind(&DOMFrame::set_dcp_paths, this, _1),
+ [](boost::filesystem::path p, int) { return p.filename().string(); },
+ false,
+ EditableListButton::NEW | EditableListButton::REMOVE
+ );
+
+ dcp_sizer->Add(dcps, 1, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ grid->Add(dcp_sizer, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
++r;
add_label_to_sizer (grid, overall_panel, _("Drive"), true, wxGBPosition(r, 0));
grid->AddGrowableCol (1);
- _dcp_open->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::open, this));
_copy->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::copy, this));
_drive->Bind (wxEVT_CHOICE, boost::bind(&DOMFrame::setup_sensitivity, this));
_drive_refresh->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::drive_refresh, this));
/* 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<FileLog>(State::write_path("disk.log"));
dcpomatic_log->set_types (dcpomatic_log->types() | LogEntry::TYPE_DISK);
LOG_DISK("dcpomatic_disk %1 started", dcpomatic_git_commit);
dcpomatic_sleep_seconds (1);
}
+ void set_dcp_paths (vector<boost::filesystem::path> dcps)
+ {
+ _dcp_paths = dcps;
+ setup_sensitivity();
+ }
+
private:
+ vector<boost::filesystem::path> dcp_paths() const
+ {
+ return _dcp_paths;
+ }
+
void sized (wxSizeEvent& ev)
{
_sizer->Layout ();
ev.Skip ();
}
-
- void open ()
- {
- 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 ();
-
- if (r != wxID_OK) {
- return;
- }
-
- _dcp_path = path;
- _dcp_name->SetLabel (std_to_wx(_dcp_path->filename().string()));
- setup_sensitivity ();
- }
-
void copy ()
{
/* Check that the selected drive still exists and update its properties if so */
}
DCPOMATIC_ASSERT (_drive->GetSelection() != wxNOT_FOUND);
- DCPOMATIC_ASSERT (static_cast<bool>(_dcp_path));
+ DCPOMATIC_ASSERT (!_dcp_paths.empty());
auto ping = [this](int attempt) {
if (_nanomsg.send(DISK_WRITER_PING "\n", 1000)) {
return;
}
- JobManager::instance()->add(make_shared<CopyToDriveJob>(*_dcp_path, _drives[_drive->GetSelection()], _nanomsg));
+ JobManager::instance()->add(make_shared<CopyToDriveJob>(_dcp_paths, _drives[_drive->GetSelection()], _nanomsg));
setup_sensitivity ();
}
void setup_sensitivity ()
{
- _copy->Enable (static_cast<bool>(_dcp_path) && _drive->GetSelection() != wxNOT_FOUND && !JobManager::instance()->work_to_do());
+ _copy->Enable (!_dcp_paths.empty() && _drive->GetSelection() != wxNOT_FOUND && !JobManager::instance()->work_to_do());
}
- wxStaticText* _dcp_name;
- wxButton* _dcp_open;
wxChoice* _drive;
wxButton* _drive_refresh;
wxButton* _copy;
JobManagerView* _jobs;
- boost::optional<boost::filesystem::path> _dcp_path;
+ std::vector<boost::filesystem::path> _dcp_paths;
std::vector<Drive> _drives;
#ifndef DCPOMATIC_OSX
boost::process::child* _writer;
};
+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));
*/
Config::drop ();
- auto 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_paths({*_dcp_to_write});
+ }
+
signal_manager = new wxSignalManager (this);
Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1));
}
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."));
}
}
- 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<boost::filesystem::path> _dcp_to_write;
};
IMPLEMENT_APP (App)