From 3aec5bf341507a821b8b67c047a3148d3e794560 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Apr 2024 19:22:19 +0300 Subject: [PATCH] Reduce path to file in logs. Show only part inside of root folder. --- src/app/puzzle/vpapplication.cpp | 11 ++++++----- src/app/tape/mapplication.cpp | 11 ++++++----- src/app/valentina/core/vapplication.cpp | 11 ++++++----- src/libs/vmisc/vabstractapplication.cpp | 14 ++++++++++++++ src/libs/vmisc/vabstractapplication.h | 2 ++ 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index 4bb773326..9cd5859d3 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -160,40 +160,41 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con { QString debugdate = "["_L1 + QDateTime::currentDateTime().toString(QStringLiteral("yyyy.MM.dd hh:mm:ss")); + QString const file = VAbstractApplication::ReduceLogContextFilePath(context.file); switch (type) { case QtDebugMsg: debugdate += QStringLiteral(":DEBUG:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, msg); vStdOut() << QApplication::translate("mNoisyHandler", "DEBUG:") << msg << "\n"; break; case QtWarningMsg: debugdate += QStringLiteral(":WARNING:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, msg); vStdErr() << QApplication::translate("mNoisyHandler", "WARNING:") << msg << "\n"; break; case QtCriticalMsg: debugdate += QStringLiteral(":CRITICAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, msg); vStdErr() << QApplication::translate("mNoisyHandler", "CRITICAL:") << msg << "\n"; break; case QtFatalMsg: debugdate += QStringLiteral(":FATAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, msg); vStdErr() << QApplication::translate("mNoisyHandler", "FATAL:") << msg << "\n"; break; case QtInfoMsg: debugdate += QStringLiteral(":INFO:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, msg); vStdOut() << QApplication::translate("mNoisyHandler", "INFO:") << msg << "\n"; diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 23b977591..af6faab33 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -196,40 +196,41 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con { QString debugdate = "["_L1 + QDateTime::currentDateTime().toString(QStringLiteral("yyyy.MM.dd hh:mm:ss")); + QString const file = VAbstractApplication::ReduceLogContextFilePath(context.file); switch (type) { case QtDebugMsg: debugdate += QStringLiteral(":DEBUG:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdOut() << QApplication::translate("mNoisyHandler", "DEBUG:") << logMsg << "\n"; break; case QtWarningMsg: debugdate += QStringLiteral(":WARNING:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("mNoisyHandler", "WARNING:") << logMsg << "\n"; break; case QtCriticalMsg: debugdate += QStringLiteral(":CRITICAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("mNoisyHandler", "CRITICAL:") << logMsg << "\n"; break; case QtFatalMsg: debugdate += QStringLiteral(":FATAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("mNoisyHandler", "FATAL:") << logMsg << "\n"; break; case QtInfoMsg: debugdate += QStringLiteral(":INFO:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdOut() << QApplication::translate("mNoisyHandler", "INFO:") << logMsg << "\n"; diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index e8db5ecf6..fafcf0662 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -225,12 +225,13 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con { QString debugdate = "["_L1 + QDateTime::currentDateTime().toString(QStringLiteral("yyyy.MM.dd hh:mm:ss")); + QString const file = VAbstractApplication::ReduceLogContextFilePath(context.file); switch (type) { case QtDebugMsg: debugdate += QStringLiteral(":DEBUG:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdOut() << QApplication::translate("vNoisyHandler", "DEBUG:") << logMsg << "\n"; @@ -241,7 +242,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con VAbstractValApplication::VApp()->PostWarningMessage(logMsg, type); } debugdate += QStringLiteral(":WARNING:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("vNoisyHandler", "WARNING:") << logMsg << "\n"; @@ -252,14 +253,14 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con VAbstractValApplication::VApp()->PostWarningMessage(logMsg, type); } debugdate += QStringLiteral(":CRITICAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("vNoisyHandler", "CRITICAL:") << logMsg << "\n"; break; case QtFatalMsg: debugdate += QStringLiteral(":FATAL:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdErr() << QApplication::translate("vNoisyHandler", "FATAL:") << logMsg << "\n"; @@ -270,7 +271,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con VAbstractValApplication::VApp()->PostWarningMessage(logMsg, type); } debugdate += QStringLiteral(":INFO:%1(%2)] %3: %4: %5") - .arg(context.file) + .arg(file) .arg(context.line) .arg(context.function, context.category, logMsg); vStdOut() << QApplication::translate("vNoisyHandler", "INFO:") << logMsg << "\n"; diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index 76de27c50..52702da16 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -287,6 +287,20 @@ auto VAbstractApplication::QtTranslationsPath(const QString &locale) -> QString #endif // defined(Q_OS_LINUX) } +//--------------------------------------------------------------------------------------------------------------------- +auto VAbstractApplication::ReduceLogContextFilePath(QString path) -> QString +{ + // Find the position of the 'src' folder in the path + vsizetype const srcIndex = path.indexOf(QDir::toNativeSeparators(QStringLiteral("/src/"))); + if (srcIndex != -1) + { + // Extract the substring starting from 'src' folder + path = path.mid(srcIndex); + } + + return path; +} + //--------------------------------------------------------------------------------------------------------------------- auto VAbstractApplication::getUndoStack() const -> QUndoStack * { diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 9b30cb3c3..b24d58060 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -78,6 +78,8 @@ public: static auto translationsPath(const QString &locale = QString()) -> QString; static auto QtTranslationsPath(const QString &locale = QString()) -> QString; + static auto ReduceLogContextFilePath(QString path) -> QString; + void LoadTranslation(QString locale); virtual void OpenSettings() = 0;