From 24f35d0d1e67aded79f423f994a54e0ece707e5b Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Tue, 28 Jul 2026 11:12:37 +0800 Subject: [PATCH] fix(storage): compare size by raw bytes instead of localized float MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extract raw byte count before brackets for accurate comparison across locales with different thousand separators (comma/dot). 提取方括号前的原始字节数进行比较，解决不同locale下千分位 分隔符(逗号/点)导致的大小比较错误。 Log: 修复存储设备大小比较在非中文locale下出错的问题 PMS: 371721 Influence: 存储设备大小比较逻辑，影响smartctl解析的设备容量显示 --- .../src/DeviceManager/DeviceStorage.cpp | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp index 57462adc..39a3bdc1 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp @@ -635,23 +635,31 @@ QString DeviceStorage::compareSize(const QString &size1, const QString &size2) if (size1.isEmpty() || size2.isEmpty()) return size1 + size2; - // 将字符串转为数字大小进行比较 - int num1 = 0; - int num2 = 0; - QRegularExpression reg(".*\\[(\\d+\\.?\\d+).*\\]"); - QRegularExpressionMatch match1 = reg.match(size1); - if (match1.hasMatch()) - num1 = match1.captured(1).toInt(); - QRegularExpressionMatch match2 = reg.match(size2); - if (match2.hasMatch()) - num2 = match2.captured(1).toInt(); + // 提取原始字节数（方括号前的数字，千分位逗号/点）比较 + // zh_CN: "Total NVM Capacity: 1,024,209,543,168 [1.02 TB]" + // de_DE: "Total NVM Capacity: 1.024.209.543.168 [1,02 TB]" + // 格式2: "Total NVM Capacity: 240,057,409,536 bytes [240 GB]" + auto extractBytes = [](const QString &str) -> quint64 { + QRegularExpression reg("(\\d[\\d,.]*)\\s*(?:bytes\\s*)?\\["); + QRegularExpressionMatch match = reg.match(str); + if (match.hasMatch()) { + QString raw = match.captured(1); + raw.remove(","); + raw.remove("."); + return raw.toULongLong(); + } + return 0; + }; + + quint64 bytes1 = extractBytes(size1); + quint64 bytes2 = extractBytes(size2); // 返回较大值 - if ((num1 - num2) > FLT_EPSILON * fmaxf(fabsf(num1), fabsf(num2))) { - qCDebug(appLog) << "DeviceStorage::compareSize, num1 > num2"; + if (bytes1 > bytes2) { + qCDebug(appLog) << "DeviceStorage::compareSize, bytes1 > bytes2"; return size1; } else { - qCDebug(appLog) << "DeviceStorage::compareSize, num1 <= num2"; + qCDebug(appLog) << "DeviceStorage::compareSize, bytes1 <= bytes2"; return size2; } }