X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_problem_report_job.cc;h=143baaa1bdeb89e576319304956ab0df9952e863;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=b2eb4e25dcbf72bde9dfddb897b761ba3f1e7cbc;hpb=009e4abb14cfcaecc0de8fab179adc7bd5feffd4;p=dcpomatic.git

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index b2eb4e25d..143baaa1b 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2017 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/>.
 
 */
 
@@ -23,14 +24,22 @@
 #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 <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
+/** @param film Film thta 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,45 +52,64 @@ 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";
 
-	add_file (body, "ffprobe.log");
-	add_file (body, "metadata.xml");
-
-	quickmail_set_body (mail, body.c_str());
-	
-	char const* error = quickmail_send (mail, "main.carlh.net", 2525, 0, 0);
-	
-	if (error) {
-		set_state (FINISHED_ERROR);
-		set_error (error, "");
-	} else {
-		set_state (FINISHED_OK);
+	body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
+
+	BOOST_FOREACH (string i, environment_info ()) {
+		body += i + "\n";
 	}
-	
-	quickmail_destroy (mail);
+
+	body += "\n";
+
+	if (_film) {
+		body += "log head and tail:\n";
+		body += "---<8----\n";
+		body += _film->log()->head_and_tail (4096);
+		body += "---<8----\n\n";
+
+		add_file (body, "ffprobe.log");
+
+		body += "---<8----\n";
+		body += _film->metadata()->write_to_string_formatted("UTF-8");
+		body += "---<8----\n";
+	}
+
+	list<string> to;
+	to.push_back ("carl@dcpomatic.com");
+
+	Emailer emailer (_from, to, "DCP-o-matic problem report", body);
+	emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
 
 	set_progress (1);
+	set_state (FINISHED_OK);
 }
 
 void
@@ -91,7 +119,7 @@ SendProblemReportJob::add_file (string& body, boost::filesystem::path file) cons
 	if (!f) {
 		return;
 	}
-	
+
 	body += file.string() + ":\n";
 	body += "---<8----\n";
 	uintmax_t const size = boost::filesystem::file_size (_film->file (file));