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=f08adea7861c27c57da1b16856a9a2b78da86707;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index f08adea78..34822b156 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,36 +1,47 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #include "send_problem_report_job.h"
 #include "compose.hpp"
 #include "film.h"
 #include "cross.h"
 #include "film.h"
 #include "log.h"
-#include "quickmail.h"
+#include "version.h"
+#include "emailer.h"
+#include "environment_info.h"
+#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 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,
@@ -43,70 +54,77 @@ SendProblemReportJob::SendProblemReportJob (
 
 }
 
+
+SendProblemReportJob::~SendProblemReportJob ()
+{
+	stop_thread ();
+}
+
+
 string
 SendProblemReportJob::name () const
 {
+	if (!_film) {
+		return _("Email problem report");
+	}
+
 	return String::compose (_("Email problem report for %1"), _film->name());
 }
 
+
 string
 SendProblemReportJob::json_name () const
 {
 	return N_("send_problem_report");
 }
 
+
 void
 SendProblemReportJob::run ()
 {
 	sub (_("Sending email"));
 	set_progress_unknown ();
 
-	quickmail mail = quickmail_create (_from.c_str(), "DCP-o-matic problem report");
-
-	quickmail_add_to (mail, "carl@dcpomatic.com");
-
 	string body = _summary + "\n\n";
 
-	body += "log head and tail:\n";
-	body += "---<8----\n";
-	body += _film->log()->head_and_tail ();
-	body += "---<8----\n\n";
+	body += "Version: " + string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n\n";
 
-	add_file (body, "ffprobe.log");
-	add_file (body, "metadata.xml");
+	for (auto i: environment_info ()) {
+		body += i + "\n";
+	}
+
+	body += "\n";
 
-	quickmail_set_body (mail, body.c_str());
+	if (_film) {
+		body += "log head and tail:\n";
+		body += "---<8----\n";
+		body += _film->log()->head_and_tail (4096);
+		body += "---<8----\n\n";
 
-	char const* error = quickmail_send (mail, "main.carlh.net", 2525, 0, 0);
+		add_file (body, "ffprobe.log");
 
-	if (error) {
-		set_state (FINISHED_ERROR);
-		set_error (error, "");
-	} else {
-		set_state (FINISHED_OK);
+		body += "---<8----\n";
+		body += _film->metadata()->write_to_string_formatted("UTF-8");
+		body += "---<8----\n";
 	}
 
-	quickmail_destroy (mail);
+	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);
 }