From 89f4174c390edb02b419f3d7dd95578a8169d409 Mon Sep 17 00:00:00 2001 From: acetone Date: Sat, 4 Dec 2021 14:43:57 -0500 Subject: [PATCH] sorting in webUi --- httpserver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpserver.cpp b/httpserver.cpp index 59e3592..4ade57e 100644 --- a/httpserver.cpp +++ b/httpserver.cpp @@ -508,6 +508,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath) } else { + std::sort(matchedPaths.begin(), matchedPaths.end()); for (auto& point: matchedPaths) { QString logFolder {m_logFolder}; logFolder.remove(QRegularExpression(".$")); @@ -539,6 +540,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath) folderNameS << folderName; } if (not folderNameS.isEmpty()) { + std::sort(folderNameS.begin(), folderNameS.end()); for (const auto &f: folderNameS) { QString onePoint = HTML_PAYLOAD_LIST_POINT_FOLDER; replaceTag(onePoint, "POINT_CONTENT", f); @@ -560,6 +562,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath) folderNameS << folderName; } if (not folderNameS.isEmpty()) { + std::sort(folderNameS.begin(), folderNameS.end()); for (const auto &f: folderNameS) { QString onePoint = HTML_PAYLOAD_LIST_POINT_FOLDER; replaceTag(onePoint, "POINT_CONTENT", f); @@ -581,6 +584,7 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath) fileNameS << fileName; } if (not fileNameS.isEmpty()) { + std::sort(fileNameS.begin(), fileNameS.end()); for (const auto &a: fileNameS) { QString onePoint = HTML_PAYLOAD_LIST_POINT_MESSAGE; replaceTag(onePoint, "POINT_CONTENT", a); @@ -623,7 +627,6 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath) } text.insert(pos+25, ' '); } - } if (text.isEmpty()) continue;