X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsend_problem_report_job.cc;h=34822b1561d7ade97c41d8dd236a4c383c9888fc;hp=3c0bc47aac58fba1fc5d87d4a108702c99b91528;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 3c0bc47aa..34822b156 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "send_problem_report_job.h"
 #include "compose.hpp"
 #include "film.h"
@@ -27,15 +28,20 @@
 #include "version.h"
 #include "emailer.h"
 #include "environment_info.h"
-#include <boost/foreach.hpp>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+
 
-/** @param film Film thta the problem is with, or 0 */
+/** @param film Film that the problem is with, or 0.
+ *  @param from Email address to use for From:
+ *  @param summary Summary of the problem.
+ */
 SendProblemReportJob::SendProblemReportJob (
 	shared_ptr<const Film> film,
 	string from,
@@ -48,6 +54,13 @@ SendProblemReportJob::SendProblemReportJob (
 
 }
 
+
+SendProblemReportJob::~SendProblemReportJob ()
+{
+	stop_thread ();
+}
+
+
 string
 SendProblemReportJob::name () const
 {
@@ -58,12 +71,14 @@ SendProblemReportJob::name () const
 	return String::compose (_("Email problem report for %1"), _film->name());
 }
 
+
 string
 SendProblemReportJob::json_name () const
 {
 	return N_("send_problem_report");
 }
 
+
 void
 SendProblemReportJob::run ()
 {
@@ -72,9 +87,9 @@ SendProblemReportJob::run ()
 
 	string body = _summary + "\n\n";
 
-	body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
+	body += "Version: " + string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n\n";
 
-	BOOST_FOREACH (string i, environment_info ()) {
+	for (auto i: environment_info ()) {
 		body += i + "\n";
 	}
 
@@ -87,35 +102,29 @@ SendProblemReportJob::run ()
 		body += "---<8----\n\n";
 
 		add_file (body, "ffprobe.log");
-		add_file (body, "metadata.xml");
-	}
 
-	list<string> to;
-	to.push_back ("carl@dcpomatic.com");
+		body += "---<8----\n";
+		body += _film->metadata()->write_to_string_formatted("UTF-8");
+		body += "---<8----\n";
+	}
 
-	Emailer emailer (_from, to, "DCP-o-matic problem report", body);
-	emailer.send ("main.carlh.net", 2525);
+	Emailer emailer (_from, {"carl@dcpomatic.com"}, "DCP-o-matic problem report", body);
+	emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
 
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
 
+
 void
 SendProblemReportJob::add_file (string& body, boost::filesystem::path file) const
 {
-	FILE* f = fopen_boost (_film->file (file), "r");
-	if (!f) {
-		return;
-	}
-
 	body += file.string() + ":\n";
 	body += "---<8----\n";
-	uintmax_t const size = boost::filesystem::file_size (_film->file (file));
-	char* buffer = new char[size + 1];
-	int const N = fread (buffer, 1, size, f);
-	buffer[N] = '\0';
-	body += buffer;
-	delete[] buffer;
+	try {
+		body += dcp::file_to_string (_film->file(file));
+	} catch (...) {
+		body += "[could not be read]\n";
+	}
 	body += "---<8----\n\n";
-	fclose (f);
 }