X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_problem_report_job.cc;h=7f60a3fdc2e8e91239a2ff92753a31e621af3ecd;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=803e655a6ee8a7bfd89873c1fddc49946b12bdbc;hpb=a385edd65f8648759e2daf1360ed1c010d161d92;p=dcpomatic.git

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 803e655a6..7f60a3fdc 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2014-2015 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/>.
 
 */
 
@@ -25,14 +26,19 @@
 #include "log.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;
 
-/** @param film Film thta the problem is with, or 0 */
+/** @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,
@@ -45,6 +51,11 @@ SendProblemReportJob::SendProblemReportJob (
 
 }
 
+SendProblemReportJob::~SendProblemReportJob ()
+{
+	stop_thread ();
+}
+
 string
 SendProblemReportJob::name () const
 {
@@ -69,7 +80,13 @@ 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";
+
+	for (auto i: environment_info ()) {
+		body += i + "\n";
+	}
+
+	body += "\n";
 
 	if (_film) {
 		body += "log head and tail:\n";
@@ -78,14 +95,14 @@ 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 ();
+	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);