From 5a39b6bc913528c1b7806c6742eb88ec10c629dc Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 21 May 2021 22:35:28 +0200 Subject: [PATCH] Improve displaying errors --- widgets/misc/internalerrorsdialog.cpp | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/widgets/misc/internalerrorsdialog.cpp b/widgets/misc/internalerrorsdialog.cpp index 32d2526..5fd28f0 100644 --- a/widgets/misc/internalerrorsdialog.cpp +++ b/widgets/misc/internalerrorsdialog.cpp @@ -1,5 +1,7 @@ #include "./internalerrorsdialog.h" +#include + #include #include #include @@ -80,20 +82,24 @@ void InternalErrorsDialog::addError(InternalError &&newError) void InternalErrorsDialog::internalAddError(const InternalError &error) { - const QString url(error.url.toString()); - - browser()->append(QString::fromUtf8(error.when.toString(DateTimeOutputFormat::DateAndTime, true).data()) % QChar(':') % QChar(' ') % error.message - % QChar('\n') % m_request % QChar(' ') % url % QChar('\n') % m_response % QChar('\n') % QString::fromLocal8Bit(error.response) % QChar('\n')); - - // also log errors to console - cerr << "internal error: " << error.message.toLocal8Bit().data(); - if (!error.url.isEmpty()) { - cerr << "\n request URL: " << url.toLocal8Bit().data(); + const QString url = error.url.toString(); + browser()->append(QString::fromUtf8(error.when.toString(DateTimeOutputFormat::DateAndTime, true).data()) % QChar(':') % QChar(' ') % error.message); + if (!url.isEmpty()) { + browser()->append(m_request % QChar(' ') % url); } if (!error.response.isEmpty()) { - cerr << "\n response: " << error.response.data(); + browser()->append(m_response % QChar('\n') % QString::fromLocal8Bit(error.response)); + } + + // also log errors to console + using namespace EscapeCodes; + cerr << Phrases::Error << error.message.toLocal8Bit().data() << Phrases::End; + if (!error.url.isEmpty()) { + cerr << "request URL: " << url.toLocal8Bit().data() << '\n'; + } + if (!error.response.isEmpty()) { + cerr << "response: " << error.response.data() << '\n'; } - cerr << endl; } void InternalErrorsDialog::updateStatusLabel()