/*
- 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
#include "cross.h"
#include "film.h"
#include "log.h"
-#include <quickmail.h>
+#include "version.h"
+#include "emailer.h"
#include "i18n.h"
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,
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);
+}