Skip to content

fix: Fix disk intreface display error on PGUX #107

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
max-lvs merged 1 commit into from
Apr 8, 2024
Merged

fix: Fix disk intreface display error on PGUX #107

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
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-diskmanager (1.3.35) unstable; urgency=medium

* adapt to new computer models PGUX

-- wangrong <wangrong@uniontech.com> Wed, 03 Apr 2024 15:11:48 +0800

deepin-diskmanager (1.3.34) stable; urgency=medium

* adapt to new computer models PGUX-L5651
Expand Down
13 changes: 10 additions & 3 deletions service/diskoperation/DeviceStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "DeviceStorage.h"
#include <QDebug>
#include <QFile>
#include <QRegularExpression>
#include "utils.h"

namespace DiskManager {
Expand Down Expand Up @@ -557,12 +558,18 @@ void DeviceStorage::getDiskInfoInterface(const QString &devicePath, QString &int
interface = "UFS 3.1";
} else if (output.contains("L540")) {
interface = "UFS 3.1";
} else if (output.contains("PGUV")
|| output.contains("W585")
|| output.contains("PGUX-L5651")) {
} else if (output.contains("PGUV")|| output.contains("W585")) {
interface = "UFS 3.0";
} else {
interface = "";

Utils::executeCmdWithArtList("dmidecode", QStringList() << "-t" << "11", output, err);
QRegularExpression re("String 4: (.+?)\\s");
QRegularExpressionMatch match = re.match(output);
if (match.hasMatch()) {
if (match.captured(1) == "PGUX")
interface = "UFS 3.0";
}
}
}
file.close();
Expand Down