From d2bd536f1bff98e85f12afa2004f39c2f5859b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 24 Nov 2018 21:36:59 +0100 Subject: [PATCH] triage: improve handling of daca@home results --- tools/triage/mainwindow.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp index 12db1c800..049ac5951 100644 --- a/tools/triage/mainwindow.cpp +++ b/tools/triage/mainwindow.cpp @@ -47,15 +47,20 @@ void MainWindow::loadFile() url = line; errorMessage.clear(); } else if (!url.isEmpty() && QRegExp(".*: (error|warning|style|note):.*").exactMatch(line)) { - if (!errorMessage.isEmpty()) - errorMessage += '\n'; - errorMessage += line; - } else if (!url.isEmpty() && QRegExp("(head|1.8.) .*:[0-9]+:.*\\]").exactMatch(line)) { + if (line.indexOf(": note:") > 0) + errorMessage += '\n' + line; + else if (errorMessage.isEmpty()) { + errorMessage = url + '\n' + line; + } else { + allErrors << errorMessage; + errorMessage = url + '\n' + line; + } + } else if (!url.isEmpty() && QRegExp("^(head|1.[0-9][0-9]) .*:[0-9]+:.*\\]").exactMatch(line)) { allErrors << (url + '\n' + line); } } - if (!url.isEmpty() && !errorMessage.isEmpty()) - allErrors << (url + "\n" + errorMessage); + if (!errorMessage.isEmpty()) + allErrors << errorMessage; if (allErrors.size() > 100) { // remove items in /test/ for (int i = allErrors.size()-1; i >= 0 && allErrors.size() > 100; --i) {