ChangeLog.

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

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index 87eb40d144a0a4926155b48b7aeab869d7f767a8..701584c74dfb7ca7c2f0f4b32f2623d0e57c50cb 100644 (file)
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -21,15 +21,23 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem.hpp>
 #include "check_hashes_job.h"
-#include "film_state.h"
 #include "options.h"
 #include "log.h"
+#include "job_manager.h"
+#include "ab_transcode_job.h"
+#include "transcode_job.h"
+#include "film.h"
+#include "exceptions.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::ifstream;
+using boost::shared_ptr;
 
-CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
-       : Job (s, o, l)
+CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
+       : Job (f, req)
+       , _decode_opt (od)
+       , _encode_opt (oe)
        , _bad (0)
 {
 
@@ -38,34 +46,61 @@ CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const
 string
 CheckHashesJob::name () const
 {
-       stringstream s;
-       s << "Check hashes of " << _fs->name;
-       return s.str ();
+       return String::compose ("Check hashes of %1", _film->name());
 }
 
 void
 CheckHashesJob::run ()
 {
        _bad = 0;
+
+       if (!_film->dcp_length()) {
+               throw EncodeError ("cannot check hashes of a DCP with unknown length");
+       }
+       
+       SourceFrame const N = _film->dcp_trim_start() + _film->dcp_length().get();
+       DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
        
-       for (int i = 0; i < _fs->length; ++i) {
-               string const j2k_file = _opt->frame_out_path (i, false);
-               string const hash_file = j2k_file + ".md5";
-
-               ifstream ref (hash_file.c_str ());
-               string hash;
-               ref >> hash;
-
-               if (hash != md5_digest (j2k_file)) {
-                       _log->log ("Frame " + lexical_cast<string> (i) + " has wrong hash; deleting.");
-                       filesystem::remove (j2k_file);
-                       filesystem::remove (hash_file);
+       for (SourceFrame i = _film->dcp_trim_start(); i < N; i += dfr.skip) {
+               string const j2k_file = _encode_opt->frame_out_path (i, false);
+               string const hash_file = _encode_opt->hash_out_path (i, false);
+
+               if (!boost::filesystem::exists (j2k_file)) {
+                       _film->log()->log (String::compose ("Frame %1 has a missing J2K file.", i));
+                       boost::filesystem::remove (hash_file);
                        ++_bad;
+               } else if (!boost::filesystem::exists (hash_file)) {
+                       _film->log()->log (String::compose ("Frame %1 has a missing hash file.", i));
+                       boost::filesystem::remove (j2k_file);
+                       ++_bad;
+               } else {
+                       ifstream ref (hash_file.c_str ());
+                       string hash;
+                       ref >> hash;
+                       if (hash != md5_digest (j2k_file)) {
+                               _film->log()->log (String::compose ("Frame %1 has wrong hash; deleting.", i));
+                               boost::filesystem::remove (j2k_file);
+                               boost::filesystem::remove (hash_file);
+                               ++_bad;
+                       }
                }
 
-               set_progress (float (i) / _fs->length);
+               set_progress (float (i) / N);
        }
 
+       if (_bad) {
+               shared_ptr<Job> tc;
+
+               if (_film->dcp_ab()) {
+                       tc.reset (new ABTranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
+               } else {
+                       tc.reset (new TranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
+               }
+               
+               JobManager::instance()->add_after (shared_from_this(), tc);
+               JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _decode_opt, _encode_opt, tc)));
+       }
+               
        set_progress (1);
        set_state (FINISHED_OK);
 }
@@ -74,6 +109,15 @@ string
 CheckHashesJob::status () const
 {
        stringstream s;
-       s << Job::status () << "; " << _bad << " bad frames found";
+       s << Job::status ();
+       if (overall_progress() > 0) {
+               if (_bad == 0) {
+                       s << "; no bad frames found";
+               } else if (_bad == 1) {
+                       s << "; 1 bad frame found";
+               } else {
+                       s << "; " << _bad << " bad frames found";
+               }
+       }
        return s.str ();
 }