Skip to content

fix(storage): compare size by raw bytes instead of localized float #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jul 28, 2026
Merged

fix(storage): compare size by raw bytes instead of localized float #715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,17 +606,26 @@ QString DeviceStorage::compareSize(const QString &size1, const QString &size2)
if (size1.isEmpty() || size2.isEmpty())
return size1 + size2;

// 将字符串转为数字大小进行比较
float num1 = 0;
float num2 = 0;
QRegExp reg(".*\\[(\\d+\\.?\\d+).*\\]");
if (reg.exactMatch(size1))
num1 = reg.cap(1).toFloat();
if (reg.exactMatch(size2))
num2 = reg.cap(1).toFloat();
// 提取原始字节数（方括号前的数字，千分位逗号/点）比较
// 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 {
QRegExp reg("(\\d[\\d,.]*)\\s*(?:bytes\\s*)?\\[");
if (reg.indexIn(str) != -1) {
QString raw = reg.cap(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)))
if (bytes1 > bytes2)
return size1;
else
return size2;
Expand Down
Loading