diff --git a/httpserver.cpp b/httpserver.cpp index fbaa66f..713259a 100644 --- a/httpserver.cpp +++ b/httpserver.cpp @@ -943,7 +943,6 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead while(folderName.contains('/')) { folderName.remove(QRegularExpression("^.*/")); } - folderName.remove(QRegularExpression("\\.txt$")); folderNameS << folderName; } if (not folderNameS.isEmpty()) { @@ -957,7 +956,16 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead if (yearIsOk and monthIsOk) { nameOfMonth = QLocale().standaloneMonthName(dateOfMonth.month()); } - replaceTag(onePoint, "POINT_CONTENT", f + " (" + nameOfMonth + ")"); + QDirIterator dayLogs(fsPath.path() + global::slash + f); + int8_t dayLogsCounter {0}; + while (dayLogs.hasNext()) { + QString dayLogFile = dayLogs.next(); + if (dayLogFile.endsWith(".") or dayLogFile.endsWith("..")) continue; + dayLogsCounter++; + } + QString filesLabel; + dayLogsCounter == 1 ? filesLabel = "file" : filesLabel = "files"; + replaceTag(onePoint, "POINT_CONTENT", "" + f + " (" + nameOfMonth + ") " + QString::number(dayLogsCounter) + " " + filesLabel); replaceTag(onePoint, "POINT_LINK", "/"+server+"/"+channel+"/"+year+"/"+f); payloadBlock += onePoint; } @@ -987,7 +995,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead if (yearIsOk and monthIsOk and dayIsOk) { nameOfDay = QLocale().standaloneDayName(dateOfDay.dayOfWeek()); } - replaceTag(onePoint, "POINT_CONTENT", a + " (" + nameOfDay + ")"); + auto logFileSize = QFile(fsPath.path() + global::slash + a +".txt").size(); + replaceTag(onePoint, "POINT_CONTENT", "" + a + " (" + nameOfDay + ") " + QString::number(logFileSize) + " bytes"); replaceTag(onePoint, "POINT_LINK", "/"+server+"/"+channel+"/"+year+"/"+month+"/"+a); payloadBlock += onePoint; }