Skip to content

fix(device): remove redundant loop in network device generation #701

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 7, 2026
Merged

fix(device): remove redundant loop in network device generation #701

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: 13 additions & 14 deletions deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,21 +353,20 @@ void DeviceGenerator::generatorNetworkDevice()
continue;

const QString &logicalNameLshw = (*it)["logical name"];
for (QList<DeviceNetwork *>::iterator itDevice = lstDevice.begin(); itDevice != lstDevice.end(); ++itDevice) {
const QString &macAddressLshw = (*it)["serial"];
if (!isValidLogicalName(logicalNameLshw))
continue;
if (!isValidMAC(macAddressLshw))
continue;
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive) && hasWlan) //common sense: one PC only have 1 wlan device
continue;

const QString &macAddressLshw = (*it)["serial"];
if (!isValidLogicalName(logicalNameLshw))
continue;
if (!isValidMAC(macAddressLshw))
continue;
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive) && hasWlan) //common sense: one PC only have 1 wlan device
continue;

DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromLshw(*it);
lstDevice.append(device);
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive))
hasWlan = true;
}
DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromLshw(*it);
lstDevice.append(device);
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive))
hasWlan = true;
}

const QList<QMap<QString, QString>> &lstHWInfo = DeviceManager::instance()->cmdInfo("hwinfo_network");
Expand Down
Loading