X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_problem_report_job.cc;h=f0c34f590bca5f823dadabbfdc70863d9d5a84a1;hb=5b3e3df6c9352e31dd932a5af215eabbf2cf27c8;hp=32fec69138fca3ecfca901ba7db98105feba0a40;hpb=90ec60c9e5b45453525368842345ad1a6498fa61;p=dcpomatic.git

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 32fec6913..f0c34f590 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,8 @@
 #include "cross.h"
 #include "film.h"
 #include "log.h"
-#include <quickmail.h>
+#include "version.h"
+#include "emailer.h"
 
 #include "i18n.h"
 
@@ -31,6 +32,7 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
+/** @param film Film thta the problem is with, or 0 */
 SendProblemReportJob::SendProblemReportJob (
 	shared_ptr<const Film> film,
 	string from,
@@ -46,51 +48,61 @@ SendProblemReportJob::SendProblemReportJob (
 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;
-	
-	body += "log head and tail:\n";
-	body += "---<8----\n";
-	body += _film->log()->head_and_tail ();
-	body += "---<8----\n\n";
-	
-	FILE* ffprobe = fopen_boost (_film->file ("ffprobe.log"), "r");
-	if (ffprobe) {
-		body += "ffprobe.log:\n";
+
+	string body = _summary + "\n\n";
+
+	body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
+
+	if (_film) {
+		body += "log head and tail:\n";
 		body += "---<8----\n";
-		uintmax_t const size = boost::filesystem::file_size (_film->file ("ffprobe.log"));
-		char* buffer = new char[size + 1];
-		int const N = fread (buffer, size, 1, ffprobe);
-		buffer[N] = '\0';
-		body += buffer;
-		delete[] buffer;
+		body += _film->log()->head_and_tail (4096);
 		body += "---<8----\n\n";
-		fclose (ffprobe);
-	}
-	
-	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);
+
+		add_file (body, "ffprobe.log");
+		add_file (body, "metadata.xml");
 	}
-	
-	quickmail_destroy (mail);
+
+	Emailer emailer (_from, "carl@dcpomatic.com", "DCP-o-matic problem report", body);
+	emailer.send (shared_from_this ());
 
 	set_progress (1);
 }
+
+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;
+	body += "---<8----\n\n";
+	fclose (f);
+}