Tidy progress report when sending problem report email.

[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 32fec69138fca3ecfca901ba7db98105feba0a40..0fd14bc2452fb6e789e2eb12d92b219209bc314f 100644 (file)
--- 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,7 @@
 #include "cross.h"
 #include "film.h"
 #include "log.h"
-#include <quickmail.h>
+#include "quickmail.h"
 
 #include "i18n.h"
 
@@ -49,36 +49,32 @@ SendProblemReportJob::name () const
        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;
+       string body = _summary + "\n\n";
        
        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";
-               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 += "---<8----\n\n";
-               fclose (ffprobe);
-       }
-       
+
+       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);
@@ -94,3 +90,23 @@ SendProblemReportJob::run ()
 
        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);
+}