Removed 5 duplicated blocks of code.
https://sonarcloud.io/project/issues?id=jonno85uk_olive&issues=AWjXpEv0EzgCzR11xzeI&open=AWjXpEv0EzgCzR11xzeI (cherry picked from commit 64bb2e7cdfac36a69e380a3c0ad5c25b97b4402f) # Conflicts: # app/debug.cpp
This commit is contained in:
@@ -34,63 +34,76 @@ QFile debug_file;
|
||||
QTextStream debug_stream;
|
||||
|
||||
void open_debug_file() {
|
||||
QDir debug_dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
|
||||
debug_dir.mkpath(".");
|
||||
if (debug_dir.exists()) {
|
||||
debug_file.setFileName(debug_dir.path() + "/debug_log");
|
||||
if (debug_file.open(QFile::WriteOnly)) {
|
||||
debug_stream.setDevice(&debug_file);
|
||||
} else {
|
||||
qWarning() << "Couldn't open debug log file, debug log will not be saved";
|
||||
}
|
||||
}
|
||||
QDir debug_dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
|
||||
debug_dir.mkpath(".");
|
||||
if (debug_dir.exists()) {
|
||||
debug_file.setFileName(debug_dir.path() + "/debug_log");
|
||||
if (debug_file.open(QFile::WriteOnly)) {
|
||||
debug_stream.setDevice(&debug_file);
|
||||
} else {
|
||||
qWarning() << "Couldn't open debug log file, debug log will not be saved";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void close_debug_file() {
|
||||
if (debug_file.isOpen()) debug_file.close();
|
||||
void close_debug_file()
|
||||
{
|
||||
if (debug_file.isOpen()) {
|
||||
debug_file.close();
|
||||
}
|
||||
}
|
||||
|
||||
void debug_message_handler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
|
||||
debug_mutex.lock();
|
||||
QByteArray localMsg = msg.toLocal8Bit();
|
||||
switch (type) {
|
||||
case QtDebugMsg:
|
||||
fprintf(stderr, "[DEBUG] %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) debug_stream << QString("[DEBUG] %1 (%2:%3, %4)\n").arg(localMsg.constData(), context.file, QString::number(context.line), context.function);
|
||||
debug_info.append(QString("<b>[DEBUG]</b> %1 (%2:%3, %4)<br>").arg(localMsg.constData(), context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
break;
|
||||
case QtInfoMsg:
|
||||
fprintf(stderr, "[INFO] %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) debug_stream << QString("[INFO] %1 (%2:%3, %4)\n").arg(localMsg.constData(), context.file, QString::number(context.line), context.function);
|
||||
debug_info.append(QString("<b>[INFO]</b> %1 (%2:%3, %4)<br>").arg(localMsg.constData(), context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
break;
|
||||
case QtWarningMsg:
|
||||
fprintf(stderr, "[WARNING] %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) debug_stream << QString("[WARNING] %1 (%2:%3, %4)\n").arg(localMsg.constData(), context.file, QString::number(context.line), context.function);
|
||||
debug_info.append(QString("<font color='yellow'><b>[WARNING]</b> %1 (%2:%3, %4)</font><br>").arg(localMsg.constData(), context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
break;
|
||||
case QtCriticalMsg:
|
||||
fprintf(stderr, "[ERROR] %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) debug_stream << QString("[ERROR] %1 (%2:%3, %4)\n").arg(localMsg.constData(), context.file, QString::number(context.line), context.function);
|
||||
debug_info.append(QString("<font color='red'><b>[ERROR]</b> %1 (%2:%3, %4)</font><br>").arg(localMsg.constData(), context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
break;
|
||||
case QtFatalMsg:
|
||||
fprintf(stderr, "[FATAL] %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) debug_stream << QString("[FATAL] %1 (%2:%3, %4)\n").arg(localMsg.constData(), context.file, QString::number(context.line), context.function);
|
||||
debug_info.append(QString("<font color='red'><b>[FATAL]</b> %1 (%2:%3, %4)</font><br>").arg(localMsg.constData(), context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
// abort();
|
||||
}
|
||||
void debug_message_handler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
|
||||
{
|
||||
debug_mutex.lock();
|
||||
const QByteArray localMsg = msg.toLocal8Bit();
|
||||
const QDateTime now = QDateTime::currentDateTime();
|
||||
const QByteArray timeRepr(now.toString(Qt::ISODate).toLocal8Bit());
|
||||
QString msgTag;
|
||||
QString fontColor;
|
||||
switch (type) {
|
||||
case QtDebugMsg:
|
||||
msgTag = "DEBUG";
|
||||
fontColor = "grey";
|
||||
break;
|
||||
case QtInfoMsg:
|
||||
msgTag = "INFO";
|
||||
fontColor = "blue";
|
||||
break;
|
||||
case QtWarningMsg:
|
||||
msgTag = "WARNING";
|
||||
fontColor = "yellow";
|
||||
break;
|
||||
case QtCriticalMsg:
|
||||
msgTag = "ERROR";
|
||||
fontColor = "red";
|
||||
break;
|
||||
case QtFatalMsg:
|
||||
msgTag = "FATAL";
|
||||
fontColor = "red";
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "Unknown debug msg type");
|
||||
fflush(stderr);
|
||||
break;
|
||||
}//switch
|
||||
|
||||
fprintf(stderr, "%s [%s] %s (%s:%u, %s)\n", timeRepr.data(), msgTag.toLocal8Bit().constData(), localMsg.data(),
|
||||
context.file, context.line, context.function);
|
||||
if (debug_file.isOpen()) {
|
||||
debug_stream << QString("[%1] %2 (%3:%4, %5)\n")
|
||||
.arg(msgTag, localMsg, context.file, QString::number(context.line), context.function);
|
||||
}
|
||||
debug_info.prepend(QString("<font color='%1'><b>[%2]</b> %3 (%4:%5, %6)</font><br>")
|
||||
.arg(fontColor, msgTag, localMsg, context.file, QString::number(context.line), context.function));
|
||||
fflush(stderr);
|
||||
if (Olive::DebugDialog != nullptr && Olive::DebugDialog->isVisible()) {
|
||||
QMetaObject::invokeMethod(Olive::DebugDialog, "update_log", Qt::QueuedConnection);
|
||||
}
|
||||
debug_mutex.unlock();
|
||||
}
|
||||
debug_mutex.unlock();
|
||||
}
|
||||
|
||||
const QString &get_debug_str() {
|
||||
return debug_info;
|
||||
const QString &get_debug_str()
|
||||
{
|
||||
return debug_info;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user