X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_batch.cc;h=8bb36476d1b3a6d22d94eea4efcdb223644c9762;hb=66e0ee10200ba850087ac7d7dcaf1ef9a30c64b2;hp=9e2d6969d9c2c39ce2a1d5d7111c412490545279;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 9e2d6969d..8bb36476d 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,34 +18,54 @@ */ -#include "wx/wx_util.h" + #include "wx/about_dialog.h" -#include "wx/wx_signal_manager.h" +#include "wx/dcpomatic_button.h" +#include "wx/full_config_dialog.h" #include "wx/job_manager_view.h" -#include "wx/config_dialog.h" #include "wx/servers_list_dialog.h" -#include "lib/version.h" +#include "wx/wx_signal_manager.h" +#include "wx/wx_util.h" #include "lib/compose.hpp" #include "lib/config.h" -#include "lib/util.h" +#include "lib/dcpomatic_socket.h" #include "lib/film.h" +#include "lib/job.h" #include "lib/job_manager.h" -#include "lib/dcpomatic_socket.h" +#include "lib/make_dcp.h" +#include "lib/transcode_job.h" +#include "lib/util.h" +#include "lib/version.h" +#include +LIBDCP_DISABLE_WARNINGS #include -#include #include #include +#include +#include #include +LIBDCP_ENABLE_WARNINGS #include +#include + +using std::cout; +using std::dynamic_pointer_cast; using std::exception; +using std::list; +using std::make_shared; +using std::set; +using std::shared_ptr; using std::string; -using std::cout; -using boost::shared_ptr; -using boost::thread; using boost::scoped_array; +using boost::thread; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + +static list films_to_load; -static boost::optional film_to_load; enum { ID_file_add_film = 1, @@ -53,11 +73,12 @@ enum { ID_help_about }; + void setup_menu (wxMenuBar* m) { - wxMenu* file = new wxMenu; - file->Append (ID_file_add_film, _("&Add Film...")); + auto file = new wxMenu; + file->Append (ID_file_add_film, _("&Add Film...\tCtrl-A")); #ifdef DCPOMATIC_OSX file->Append (wxID_EXIT, _("&Exit")); #else @@ -67,14 +88,14 @@ setup_menu (wxMenuBar* m) #ifdef DCPOMATIC_OSX file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #else - wxMenu* edit = new wxMenu; + auto edit = new wxMenu; edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #endif - wxMenu* tools = new wxMenu; + auto tools = new wxMenu; tools->Append (ID_tools_encoding_servers, _("Encoding servers...")); - wxMenu* help = new wxMenu; + auto help = new wxMenu; help->Append (ID_help_about, _("About")); m->Append (file, _("&File")); @@ -85,56 +106,124 @@ setup_menu (wxMenuBar* m) m->Append (help, _("&Help")); } + class DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) - : wxFrame (NULL, -1, title) - , _sizer (new wxBoxSizer (wxVERTICAL)) - , _config_dialog (0) - , _servers_list_dialog (0) + enum class Tool { + ADD, + PAUSE + }; + + explicit DOMFrame (wxString const & title) + : wxFrame (nullptr, -1, title) + , _sizer (new wxBoxSizer(wxVERTICAL)) { - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), ID_help_about); + Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); - wxPanel* panel = new wxPanel (this); - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), ID_help_about); + + auto panel = new wxPanel (this); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (panel, 1, wxEXPAND); SetSizer (s); - JobManagerView* job_manager_view = new JobManagerView (panel); - _sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6); + wxBitmap add(icon_path("add"), wxBITMAP_TYPE_PNG); + wxBitmap pause(icon_path("pause"), wxBITMAP_TYPE_PNG); - wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL); - wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film...")); - add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this)); - buttons->Add (add, 1, wxALL, 6); + auto toolbar = new wxToolBar(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL); + toolbar->SetMargins(4, 4); + toolbar->SetToolBitmapSize(wxSize(32, 32)); + toolbar->AddTool(static_cast(Tool::ADD), _("Add film"), add, _("Add film for conversion")); + toolbar->AddCheckTool(static_cast(Tool::PAUSE), _("Pause/resume"), pause, wxNullBitmap, _("Pause or resume conversion")); + toolbar->Realize(); + _sizer->Add(toolbar, 0, wxALL, 6); - _sizer->Add (buttons, 0, wxALL, 6); + toolbar->Bind(wxEVT_TOOL, bind(&DOMFrame::tool_clicked, this, _1)); + + auto job_manager_view = new JobManagerView (panel, true); + _sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6); panel->SetSizer (_sizer); - Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); - Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1)); + Bind (wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1)); + Bind (wxEVT_SIZE, boost::bind(&DOMFrame::sized, this, _1)); + } + + void tool_clicked(wxCommandEvent& ev) + { + switch (static_cast(ev.GetId())) { + case Tool::ADD: + add_film(); + break; + case Tool::PAUSE: + { + auto jm = JobManager::instance(); + if (jm->paused()) { + jm->resume(); + } else { + jm->pause(); + } + break; + } + } } void start_job (boost::filesystem::path path) { try { - shared_ptr film (new Film (path)); + auto film = make_shared(path); film->read_metadata (); - film->make_dcp (); + + double total_required; + double available; + bool can_hard_link; + + film->should_be_enough_disk_space (total_required, available, can_hard_link); + + set> films; + + for (auto i: JobManager::instance()->get()) { + films.insert (i->film()); + } + + for (auto i: films) { + double progress = 0; + for (auto j: JobManager::instance()->get()) { + if (i == j->film() && dynamic_pointer_cast(j)) { + progress = j->progress().get_value_or(0); + } + } + + double required; + i->should_be_enough_disk_space (required, available, can_hard_link); + total_required += (1 - progress) * required; + } + + if ((total_required - available) > 1) { + if (!confirm_dialog ( + this, + wxString::Format( + _("The DCPs for this film and the films already in the queue will take up about %.1f GB. The " + "disks that you are using only have %.1f GB available. Do you want to add this film to the queue anyway?"), + total_required, available))) { + return; + } + } + + make_dcp (film, TranscodeJob::ChangedBehaviour::STOP); } catch (std::exception& e) { - wxString p = std_to_wx (path.string ()); - wxCharBuffer b = p.ToUTF8 (); - error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data())); + auto p = std_to_wx (path.string ()); + auto b = p.ToUTF8 (); + error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what())); } } @@ -147,11 +236,11 @@ private: bool should_close () { - if (!JobManager::instance()->work_to_do ()) { + if (!JobManager::instance()->work_to_do()) { return true; } - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("There are unfinished jobs; are you sure you want to quit?"), _("Unfinished jobs"), @@ -165,7 +254,7 @@ private: void close (wxCloseEvent& ev) { - if (!should_close ()) { + if (!should_close()) { ev.Veto (); return; } @@ -180,7 +269,7 @@ private: void file_quit () { - if (should_close ()) { + if (should_close()) { Close (true); } } @@ -188,7 +277,7 @@ private: void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_full_config_dialog (); } _config_dialog->Show (this); } @@ -204,16 +293,16 @@ private: void help_about () { - AboutDialog* d = new AboutDialog (this); + auto d = new AboutDialog (this); d->ShowModal (); d->Destroy (); } void add_film () { - wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + auto c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); if (_last_parent) { - c->SetPath (std_to_wx (_last_parent.get().string ())); + c->SetPath (std_to_wx(_last_parent.get().string())); } int r; @@ -235,34 +324,66 @@ private: c->Destroy (); } + void config_changed (Config::Property what) + { + /* Instantly save any config changes when using the DCP-o-matic GUI */ + if (what == Config::CINEMAS) { + try { + Config::instance()->write_cinemas(); + } catch (exception& e) { + error_dialog ( + this, + wxString::Format( + _("Could not write to cinemas file at %s. Your changes have not been saved."), + std_to_wx (Config::instance()->cinemas_file().string()).data() + ) + ); + } + } else { + try { + Config::instance()->write_config(); + } catch (exception& e) { + error_dialog ( + this, + wxString::Format( + _("Could not write to config file at %s. Your changes have not been saved."), + std_to_wx (Config::instance()->cinemas_file().string()).data() + ) + ); + } + } + } + boost::optional _last_parent; wxSizer* _sizer; - wxPreferencesEditor* _config_dialog; - ServersListDialog* _servers_list_dialog; + wxPreferencesEditor* _config_dialog = nullptr; + ServersListDialog* _servers_list_dialog = nullptr; }; + static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; + class JobServer : public Server { public: - JobServer (DOMFrame* frame) - : Server (Config::instance()->server_port_base() + 2) + explicit JobServer (DOMFrame* frame) + : Server (BATCH_JOB_PORT) , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); - scoped_array buffer (new char[length]); - socket->read (reinterpret_cast (buffer.get()), length); + scoped_array buffer(new char[length]); + socket->read (reinterpret_cast(buffer.get()), length); string s (buffer.get()); _frame->start_job (s); - socket->write (reinterpret_cast ("OK"), 3); + socket->write (reinterpret_cast("OK"), 3); } catch (...) { } @@ -272,11 +393,20 @@ private: DOMFrame* _frame; }; + class App : public wxApp { - bool OnInit () + bool OnInit () override { + wxInitAllImageHandlers (); + SetAppName (_("DCP-o-matic Batch Converter")); + is_batch_converter = true; + + Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1)); + Config::Warning.connect (boost::bind(&App::config_warning, this, _1)); + + auto splash = maybe_show_splash (); if (!wxApp::OnInit()) { return false; @@ -306,27 +436,38 @@ class App : public wxApp */ Config::drop (); - DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter")); - SetTopWindow (f); - f->Maximize (); - f->Show (); + _frame = new DOMFrame (_("DCP-o-matic Batch Converter")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + } + _frame->Show (); - JobServer* server = new JobServer (f); - new thread (boost::bind (&JobServer::run, server)); + try { + auto server = new JobServer (_frame); + new thread (boost::bind (&JobServer::run, server)); + } catch (boost::system::system_error& e) { + error_dialog(_frame, _("Could not listen for new batch jobs. Perhaps another instance of the DCP-o-matic Batch Converter is running.")); + } signal_manager = new wxSignalManager (this); this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); shared_ptr film; - if (film_to_load && boost::filesystem::is_directory (film_to_load.get())) { - try { - film.reset (new Film (film_to_load.get())); - film->read_metadata (); - film->make_dcp (); - } catch (exception& e) { - error_dialog ( - 0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load->string(), e.what())) - ); + for (auto i: films_to_load) { + if (boost::filesystem::is_directory(i)) { + try { + film = make_shared(i); + film->read_metadata (); + make_dcp (film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); + } catch (exception& e) { + error_dialog ( + 0, + std_to_wx(String::compose(wx_to_std(_("Could not load film %1")), i.string())), + std_to_wx(e.what()) + ); + } } } @@ -338,20 +479,33 @@ class App : public wxApp signal_manager->ui_idle (); } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { - if (parser.GetParamCount() > 0) { - film_to_load = wx_to_std (parser.GetParam(0)); + for (size_t i = 0; i < parser.GetParamCount(); ++i) { + films_to_load.push_back (wx_to_std(parser.GetParam(i))); } return true; } + + void config_failed_to_load(Config::LoadFailure what) + { + report_config_load_failure(_frame, what); + } + + void config_warning (string m) + { + message_dialog (_frame, std_to_wx(m)); + } + + DOMFrame* _frame; }; + IMPLEMENT_APP (App)