Pass options only to jobs that need them.

[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 cf269564aa7f2dc81717907249e087fef2c5d835..478e4c91afc4649b995fcb5c74ba3686564ba8d5 100644 (file)
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -31,8 +31,9 @@
 using namespace std;
 using namespace boost;
 
-CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
-       : Job (s, o, l)
+CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
+       : Job (s, l, req)
+       , _opt (o)
        , _bad (0)
 {
 
@@ -41,43 +42,54 @@ CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const
 string
 CheckHashesJob::name () const
 {
-       return String::compose ("Check hashes of %1", _fs->name);
+       return String::compose ("Check hashes of %1", _fs->name());
 }
 
 void
 CheckHashesJob::run ()
 {
        _bad = 0;
+
+       int const N = _fs->dcp_length ();
        
-       for (int i = 0; i < _fs->length; ++i) {
+       for (int i = 0; i < N; ++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);
+               if (!filesystem::exists (j2k_file)) {
+                       _log->log (String::compose ("Frame %1 has a missing J2K file.", i));
                        filesystem::remove (hash_file);
                        ++_bad;
+               } else if (!filesystem::exists (hash_file)) {
+                       _log->log (String::compose ("Frame %1 has a missing hash file.", i));
+                       filesystem::remove (j2k_file);
+                       ++_bad;
+               } else {
+                       ifstream ref (hash_file.c_str ());
+                       string hash;
+                       ref >> hash;
+                       if (hash != md5_digest (j2k_file)) {
+                               _log->log (String::compose ("Frame %1 has wrong hash; deleting.", i));
+                               filesystem::remove (j2k_file);
+                               filesystem::remove (hash_file);
+                               ++_bad;
+                       }
                }
 
-               set_progress (float (i) / _fs->length);
+               set_progress (float (i) / _fs->length());
        }
 
        if (_bad) {
                shared_ptr<Job> tc;
 
-               if (_fs->dcp_ab) {
-                       tc.reset (new ABTranscodeJob (_fs, _opt, _log));
+               if (_fs->dcp_ab()) {
+                       tc.reset (new ABTranscodeJob (_fs, _opt, _log, shared_from_this()));
                } else {
-                       tc.reset (new TranscodeJob (_fs, _opt, _log));
+                       tc.reset (new TranscodeJob (_fs, _opt, _log, shared_from_this()));
                }
                
                JobManager::instance()->add_after (shared_from_this(), tc);
-               JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_fs, _opt, _log)));
+               JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_fs, _opt, _log, tc)));
        }
                
        set_progress (1);