Skip to content

sync: from linuxdeepin/dtkcore #148

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
18202781743 merged 1 commit into from
Sep 25, 2025
Merged

sync: from linuxdeepin/dtkcore #148

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions include/global/dsysinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class LIBDTKCORESHARED_EXPORT DSysInfo
UosMilitaryS, // for Server
UosDeviceEdition,
UosEducation,
UosDefense,

UosEditionCount // must at last
};
Expand Down
48 changes: 33 additions & 15 deletions src/dsysinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,14 @@ class Q_DECL_HIDDEN DSysInfoPrivate
struct OSBuild {
OSBuild():A(0), B(0), C(0), D(0), xyz(100){
}
uint A, B, C, D, E, xyz; // ABCDE.xyz

/* ABCDE.xyz模式
系统构建号 A B C D E x yz
值含义 操作系统产品的大版本代号 产品线类型 功能小版本 产品线版本 处理器架构 固定值 补丁小版本
值位数 1 1 1 1 1 1 2
值范围 ------------------------- 0～9、A~Z --------------------------- 1 00~99，AA~ZZ
*/
uint A, B, C, D, E, xyz;
};

MinVersion minVersion;
Expand Down Expand Up @@ -139,9 +146,12 @@ bool DSysInfoPrivate::splitA_BC_DMode()
minVersion.D = minv % 10;
} else if (minorVersion.length() > 0) {
const QString D = minorVersion.right(1);
if (D.contains(QRegularExpression("[0-9A-Z]"))) {
// 0-9...A-Z
minVersion.D = 10 + static_cast<uint>(D.data()->toLatin1() - 'A');
const QChar ch = D.at(0);
if (ch.isDigit()) {
minVersion.D = static_cast<uint>(ch.unicode() - '0');
} else if (ch >= 'A' && ch <= 'Z') {
// 0-9...A-Z -> 10..35
minVersion.D = 10 + static_cast<uint>(ch.unicode() - 'A');
} else {
qWarning() << "invalid minorVersion";
minVersion.D = 0;
Expand Down Expand Up @@ -266,19 +276,24 @@ bool DSysInfoPrivate::ensureOsVersion()
D_ASSET_EXIT(left.size() == 5, "OsBuild version(ls) invalid!");

int idx = 0;
osBuild.A = left.value(idx++, "0").toUInt(&ok);
auto parseDigitOrAZ = [&](const QString &s, bool *outOk) -> uint {
if (s.isEmpty()) { if (outOk) *outOk = false; return 0u; }
const QChar ch = s.at(0);
if (ch.isDigit()) { if (outOk) *outOk = true; return static_cast<uint>(ch.unicode() - '0'); }
if (ch >= 'A' && ch <= 'Z') { if (outOk) *outOk = true; return static_cast<uint>(ch.toLatin1()); }
if (outOk) *outOk = false;
return 0u;
};

osBuild.A = parseDigitOrAZ(left.value(idx++, "0"), &ok);
D_ASSET_EXIT(ok, "OsBuild version(A) invalid!");
osBuild.B = left.value(idx++, "0").toUInt(&ok);
osBuild.B = parseDigitOrAZ(left.value(idx++, "0"), &ok);
D_ASSET_EXIT(ok, "OsBuild version(B) invalid!");
osBuild.C = left.value(idx++, "0").toUInt(&ok);
if (!ok) {
auto c = left.value(idx-1, "0").toLatin1();
D_ASSET_EXIT(c.size()>0, "OsBuild version(C) invalid!");
osBuild.C = uint(c.at(0));
}
osBuild.D = left.value(idx++, "0").toUInt(&ok);
osBuild.C = parseDigitOrAZ(left.value(idx++, "0"), &ok);
D_ASSET_EXIT(ok, "OsBuild version(C) invalid!");
osBuild.D = parseDigitOrAZ(left.value(idx++, "0"), &ok);
D_ASSET_EXIT(ok, "OsBuild version(D) invalid!");
osBuild.E = left.value(idx++, "0").toUInt(&ok);
osBuild.E = parseDigitOrAZ(left.value(idx++, "0"), &ok);
D_ASSET_EXIT(ok, "OsBuild version(E) invalid!");

// xyz
Expand Down Expand Up @@ -682,10 +697,13 @@ DSysInfo::UosEdition DSysInfo::uosEditionType()
case 3:
return UosEuler;
case 4:
case 9:
return UosMilitaryS;
case 5:
return UosDeviceEdition;
case 9:
return UosEducation; // 服务器 教育版(UT-3-PP-PR-001_操作系统标识与产品版本号规范_20250905)
case 'A':
return UosDefense; // 服务器 国防版
default:
break;
}
Expand Down
Loading