From: Carl Hetherington Date: Sat, 12 Jan 2019 21:17:41 +0000 (+0000) Subject: Check available disk space when adding jobs to the batch converter (#1249). X-Git-Tag: v2.13.99~12 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=a31113a61e88293e984f1cf486c0bb8cc5aa5975;p=dcpomatic.git Check available disk space when adding jobs to the batch converter (#1249). --- diff --git a/ChangeLog b/ChangeLog index d13331d6c..085ff48b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2019-01-12 Carl Hetherington + + * Check available disk space when adding jobs to the batch converter (#1249). + 2019-01-10 Carl Hetherington * Add File->Close to main DCP-o-matic (bound to Cmd-W on Mac) (#1180). diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index ca5b4cfe1..e01ee9114 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -33,6 +33,7 @@ #include "lib/job_manager.h" #include "lib/job.h" #include "lib/dcpomatic_socket.h" +#include "lib/transcode_job.h" #include #include #include @@ -46,9 +47,11 @@ using std::exception; using std::string; using std::cout; using std::list; +using std::set; using boost::shared_ptr; using boost::thread; using boost::scoped_array; +using boost::dynamic_pointer_cast; static list films_to_load; @@ -163,6 +166,43 @@ public: try { shared_ptr film (new Film (path)); film->read_metadata (); + + double total_required; + double available; + bool can_hard_link; + + film->should_be_enough_disk_space (total_required, available, can_hard_link); + + set > films; + + BOOST_FOREACH (shared_ptr i, JobManager::instance()->get()) { + films.insert (i->film()); + } + + BOOST_FOREACH (shared_ptr i, films) { + double progress = 0; + BOOST_FOREACH (shared_ptr 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 %1.f 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; + } + } + film->make_dcp (); } catch (std::exception& e) { wxString p = std_to_wx (path.string ());