X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcheck_hashes_job.cc;h=478e4c91afc4649b995fcb5c74ba3686564ba8d5;hb=cbaed1119cdf3acb8662e5240f59706722437d94;hp=f07a5ab2accaf9d98172bbb2ba9da7cd213b0516;hpb=9dd38ef2f05b24ba669acb9805e0914ac227fff2;p=dcpomatic.git

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index f07a5ab2a..478e4c91a 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -32,7 +32,8 @@ using namespace std;
 using namespace boost;
 
 CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
-	: Job (s, o, l, req)
+	: Job (s, l, req)
+	, _opt (o)
 	, _bad (0)
 {
 
@@ -41,7 +42,7 @@ 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
@@ -55,24 +56,33 @@ CheckHashesJob::run ()
 		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) {
+		if (_fs->dcp_ab()) {
 			tc.reset (new ABTranscodeJob (_fs, _opt, _log, shared_from_this()));
 		} else {
 			tc.reset (new TranscodeJob (_fs, _opt, _log, shared_from_this()));