Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / src / lib / job.cc

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 896862d143f7c9c7c26514d4e17d1e7d966652f5..77d3671369481b0728cac6b369827a6291fab1fb 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -27,17 +27,17 @@
 #include "job.h"
 #include "util.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::list;
 using std::stringstream;
 using boost::shared_ptr;
 
 /** @param s Film that we are operating on.
- *  @param req Job that must be completed before this job is run.
  */
-Job::Job (shared_ptr<Film> f, shared_ptr<Job> req)
+Job::Job (shared_ptr<Film> f)
        : _film (f)
-       , _required (req)
        , _state (NEW)
        , _start_time (0)
        , _progress_unknown (false)
@@ -67,19 +67,34 @@ Job::run_wrapper ()
                
                set_progress (1);
                set_state (FINISHED_ERROR);
-               set_error (String::compose ("%1 (%2)", e.what(), boost::filesystem::path (e.filename()).leaf()));
                
+               string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
+               
+               boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
+               if (s.available < pow (1024, 3)) {
+                       m += N_("\n\n");
+                       m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
+               }
+
+               set_error (e.what(), m);
+               
        } catch (std::exception& e) {
 
                set_progress (1);
                set_state (FINISHED_ERROR);
-               set_error (e.what ());
+               set_error (
+                       e.what (),
+                       _("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+                       );
 
        } catch (...) {
 
                set_progress (1);
                set_state (FINISHED_ERROR);
-               set_error ("unknown exception");
+               set_error (
+                       _("Unknown error"),
+                       _("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+                       );
 
        }
 }
@@ -211,22 +226,30 @@ Job::descend (float a)
        _stack.push_back (Level (a));
 }
 
-/** @return Any error string that the job has generated */
 string
-Job::error () const
+Job::error_details () const
 {
        boost::mutex::scoped_lock lm (_state_mutex);
-       return _error;
+       return _error_details;
+}
+
+/** @return A summary of any error that the job has generated */
+string
+Job::error_summary () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _error_summary;
 }
 
 /** Set the current error string.
  *  @param e New error string.
  */
 void
-Job::set_error (string e)
+Job::set_error (string s, string d)
 {
        boost::mutex::scoped_lock lm (_state_mutex);
-       _error = e;
+       _error_summary = s;
+       _error_details = d;
 }
 
 /** Say that this job's progress will be unknown until further notice */
@@ -245,15 +268,24 @@ Job::status () const
        int const t = elapsed_time ();
        int const r = remaining_time ();
 
+       int pc = rint (p * 100);
+       if (pc == 100) {
+               /* 100% makes it sound like we've finished when we haven't */
+               pc = 99;
+       }
+
        stringstream s;
-       if (!finished () && p >= 0 && t > 10 && r > 0) {
-               s << rint (p * 100) << "%; " << seconds_to_approximate_hms (r) << " remaining";
-       } else if (!finished () && (t <= 10 || r == 0)) {
-               s << rint (p * 100) << "%";
+       if (!finished ()) {
+               s << pc << N_("%");
+               if (p >= 0 && t > 10 && r > 0) {
+                       /// TRANSLATORS: remaining here follows an amount of time that is remaining
+                       /// on an operation.
+                       s << "; " << seconds_to_approximate_hms (r) << " " << _("remaining");
+               }
        } else if (finished_ok ()) {
-               s << "OK (ran for " << seconds_to_hms (_ran_for) << ")";
+               s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for));
        } else if (finished_in_error ()) {
-               s << "Error (" << error() << ")";
+               s << String::compose (_("Error (%1)"), error_summary());
        }
 
        return s.str ();