diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-06 21:41:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-06 21:41:43 +0000 |
| commit | 90ec60c9e5b45453525368842345ad1a6498fa61 (patch) | |
| tree | 720e97d855e98c4c62ffecfe4e2945a32ab27dc9 /src/lib | |
| parent | b17b68bb8e564601c7ea80ceea853fa564998c39 (diff) | |
Basic support for emailing a report of a problem (#43).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/job.cc | 4 | ||||
| -rw-r--r-- | src/lib/log.cc | 39 | ||||
| -rw-r--r-- | src/lib/log.h | 14 | ||||
| -rw-r--r-- | src/lib/send_problem_report_job.cc | 96 | ||||
| -rw-r--r-- | src/lib/send_problem_report_job.h | 39 | ||||
| -rw-r--r-- | src/lib/util.h | 1 | ||||
| -rw-r--r-- | src/lib/wscript | 1 |
7 files changed, 190 insertions, 4 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 7be171417..3cd729515 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -109,7 +109,7 @@ Job::run_wrapper () set_error ( e.what (), - _("It is not known what caused this error. Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).") + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM ); set_progress (1); @@ -119,7 +119,7 @@ Job::run_wrapper () set_error ( _("Unknown error"), - _("It is not known what caused this error. Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).") + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM ); set_progress (1); diff --git a/src/lib/log.cc b/src/lib/log.cc index 5e8277a23..156f8cf8b 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -123,3 +123,42 @@ FileLog::do_log (string m) fclose (f); } +string +FileLog::head_and_tail () const +{ + boost::mutex::scoped_lock lm (_mutex); + + uintmax_t head_amount = 1024; + uintmax_t tail_amount = 1024; + uintmax_t size = boost::filesystem::file_size (_file); + + if (size < (head_amount + tail_amount)) { + head_amount = size; + tail_amount = 0; + } + + FILE* f = fopen_boost (_file, "r"); + if (!f) { + return ""; + } + + string out; + + char* buffer = new char[max(head_amount, tail_amount) + 1]; + + int N = fread (buffer, 1, head_amount, f); + buffer[N] = '\0'; + out += buffer; + + fseek (f, tail_amount, SEEK_END); + + N = fread (buffer, 1, tail_amount, f); + buffer[N] = '\0'; + out += buffer; + + delete[] buffer; + + fclose (f); + + return out; +} diff --git a/src/lib/log.h b/src/lib/log.h index 94d30de4e..f20b0a148 100644 --- a/src/lib/log.h +++ b/src/lib/log.h @@ -48,12 +48,17 @@ public: void set_types (int types); + virtual std::string head_and_tail () const = 0; + +protected: + + /** mutex to protect the log */ + mutable boost::mutex _mutex; + private: virtual void do_log (std::string m) = 0; void config_changed (); - /** mutex to protect the log */ - boost::mutex _mutex; /** bit-field of log types which should be put into the log (others are ignored) */ int _types; boost::signals2::scoped_connection _config_connection; @@ -64,6 +69,8 @@ class FileLog : public Log public: FileLog (boost::filesystem::path file); + std::string head_and_tail () const; + private: void do_log (std::string m); /** filename to write to */ @@ -73,6 +80,9 @@ private: class NullLog : public Log { public: + std::string head_and_tail () const { + return ""; + } private: void do_log (std::string) {} diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc new file mode 100644 index 000000000..32fec6913 --- /dev/null +++ b/src/lib/send_problem_report_job.cc @@ -0,0 +1,96 @@ +/* + Copyright (C) 2014 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 + 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, + 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. + +*/ + +#include "send_problem_report_job.h" +#include "compose.hpp" +#include "film.h" +#include "cross.h" +#include "film.h" +#include "log.h" +#include <quickmail.h> + +#include "i18n.h" + +using std::string; +using std::list; +using boost::shared_ptr; + +SendProblemReportJob::SendProblemReportJob ( + shared_ptr<const Film> film, + string from, + string summary + ) + : Job (film) + , _from (from) + , _summary (summary) +{ + +} + +string +SendProblemReportJob::name () const +{ + return String::compose (_("Email problem report for %1"), _film->name()); +} + +void +SendProblemReportJob::run () +{ + 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"; + 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); + } + + 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); + } + + quickmail_destroy (mail); + + set_progress (1); +} diff --git a/src/lib/send_problem_report_job.h b/src/lib/send_problem_report_job.h new file mode 100644 index 000000000..76a920ad3 --- /dev/null +++ b/src/lib/send_problem_report_job.h @@ -0,0 +1,39 @@ +/* + Copyright (C) 2014 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 + 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, + 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. + +*/ + +#include <boost/filesystem.hpp> +#include <dcp/types.h> +#include "job.h" + +class SendProblemReportJob : public Job +{ +public: + SendProblemReportJob ( + boost::shared_ptr<const Film>, + std::string from, + std::string summary + ); + + std::string name () const; + void run (); + +private: + std::string _from; + std::string _summary; +}; diff --git a/src/lib/util.h b/src/lib/util.h index 724e8937c..93d0587c5 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -46,6 +46,7 @@ extern "C" { #define MAX_DCP_AUDIO_CHANNELS 12 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way" #define HISTORY_SIZE 10 +#define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com") class Job; struct AVSubtitle; diff --git a/src/lib/wscript b/src/lib/wscript index d62c22bae..69483a836 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -70,6 +70,7 @@ sources = """ scp_dcp_job.cc scaler.cc send_kdm_email_job.cc + send_problem_report_job.cc server.cc server_finder.cc single_stream_audio_content.cc |
