From c46490fd432ec53a47e95ddce5c08c0b5dfd9e31 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Tue, 17 Mar 2026 21:24:06 +0100 Subject: [PATCH] Reformat file size --- .../settings/SystemInformationActivity.cpp | 15 +++++++++------ src/network/CrossPointWebServer.h | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/activities/settings/SystemInformationActivity.cpp b/src/activities/settings/SystemInformationActivity.cpp index 02fa7531..09aaa4e7 100644 --- a/src/activities/settings/SystemInformationActivity.cpp +++ b/src/activities/settings/SystemInformationActivity.cpp @@ -9,13 +9,16 @@ #include "fontIds.h" static std::string formatBytes(uint64_t bytes) { - if (bytes >= 1024ULL * 1024 * 1024) { - char buf[16]; - snprintf(buf, sizeof(buf), "%.1f GB", bytes / (1024.0 * 1024 * 1024)); - return buf; - } char buf[16]; - snprintf(buf, sizeof(buf), "%u MB", static_cast(bytes / (1024 * 1024))); + if (bytes >= 1024ULL * 1024 * 1024) { + snprintf(buf, sizeof(buf), "%.1f GB", bytes / (1024.0 * 1024.0 * 1024.0)); + } else if (bytes >= 1024ULL * 1024) { + snprintf(buf, sizeof(buf), "%.1f MB", bytes / (1024.0 * 1024.0)); + } else if (bytes >= 1024ULL) { + snprintf(buf, sizeof(buf), "%.1f KB", bytes / 1024.0); + } else { + snprintf(buf, sizeof(buf), "%llu B", static_cast(bytes)); + } return buf; } diff --git a/src/network/CrossPointWebServer.h b/src/network/CrossPointWebServer.h index dc1fd0a6..20ac2ef0 100644 --- a/src/network/CrossPointWebServer.h +++ b/src/network/CrossPointWebServer.h @@ -84,7 +84,6 @@ class CrossPointWebServer { // File scanning void scanFiles(const char* path, const std::function& callback) const; - String formatFileSize(size_t bytes) const; bool isEpubFile(const String& filename) const; // Request handlers