projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: support validity periods in ecinema KDMs.
[dcpomatic.git]
/
src
/
lib
/
send_problem_report_job.cc
diff --git
a/src/lib/send_problem_report_job.cc
b/src/lib/send_problem_report_job.cc
index 7c4a8448602eeeb3a1ef98c163a887e45e5fa7fe..11f700de077490751550913257e8991df05f4d8a 100644
(file)
--- a/
src/lib/send_problem_report_job.cc
+++ b/
src/lib/send_problem_report_job.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
7
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.
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
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,8
+24,11
@@
#include "cross.h"
#include "film.h"
#include "log.h"
#include "cross.h"
#include "film.h"
#include "log.h"
-#include "quickmail.h"
#include "version.h"
#include "version.h"
+#include "emailer.h"
+#include "environment_info.h"
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
#include "i18n.h"
#include "i18n.h"
@@
-32,6
+36,10
@@
using std::string;
using std::list;
using boost::shared_ptr;
using std::list;
using boost::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,
SendProblemReportJob::SendProblemReportJob (
shared_ptr<const Film> film,
string from,
@@
-47,6
+55,10
@@
SendProblemReportJob::SendProblemReportJob (
string
SendProblemReportJob::name () const
{
string
SendProblemReportJob::name () const
{
+ if (!_film) {
+ return _("Email problem report");
+ }
+
return String::compose (_("Email problem report for %1"), _film->name());
}
return String::compose (_("Email problem report for %1"), _film->name());
}
@@
-62,36
+74,37
@@
SendProblemReportJob::run ()
sub (_("Sending email"));
set_progress_unknown ();
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";
string body = _summary + "\n\n";
- body += string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
+ body +=
"Version: " +
string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
- body += "log head and tail:\n";
- body += "---<8----\n";
- body += _film->log()->head_and_tail ();
- body += "---<8----\n\n";
+ BOOST_FOREACH (string i, environment_info ()) {
+ body += i + "\n";
+ }
- add_file (body, "ffprobe.log");
- add_file (body, "metadata.xml");
+ 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);
+ 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_progress (1);
+ set_state (FINISHED_OK);
}
void
}
void