Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: workaround for bogus udev "change" event

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-03 01:33:51 +03:00
parent 2d1d7daf82
commit a637b54384
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
solid/solid/backends/udev/udevmanager.cpp
View file

@ -32,6 +32,8 @@
using namespace Solid::Backends::UDev;
using namespace Solid::Backends::Shared;
// #define UDEV_DETAILED_OUTPUT
class UDevManager::Private
{
public:
@ -235,26 +237,37 @@ QObject *UDevManager::createDevice(const QString &udi_)
void UDevManager::slotDeviceAdded(const UdevQt::Device &device)
{
if (d->isOfInterest(udiPrefix() + device.sysfsPath(), device)) {
emit deviceAdded(udiPrefix() + device.sysfsPath());
const QString udi = udiPrefix() + device.sysfsPath();
if (d->isOfInterest(udi, device)) {
emit deviceAdded(udi);
}
}
void UDevManager::slotDeviceRemoved(const UdevQt::Device &device)
{
if (d->isOfInterest(udiPrefix() + device.sysfsPath(), device)) {
emit deviceRemoved(udiPrefix() + device.sysfsPath());
d->m_devicesOfInterest.removeAll(udiPrefix() + device.sysfsPath());
const QString udi = udiPrefix() + device.sysfsPath();
if (d->isOfInterest(udi, device)) {
emit deviceRemoved(udi);
d->m_devicesOfInterest.removeAll(udi);
}
}
void UDevManager::slotDeviceChanged(const UdevQt::Device &device)
{
if (d->isOfInterest(udiPrefix() + device.sysfsPath(), device)) {
const QString udi = udiPrefix() + device.sysfsPath();
const bool wasofinterest = d->m_devicesOfInterest.contains(udi);
if (d->isOfInterest(udi, device)) {
if (device.subsystem() == "block") {
const QString idfsusage = device.deviceProperty("ID_FS_USAGE");
const bool hascontent = (idfsusage == "filesystem" || idfsusage == "crypto");
emit contentChanged(udiPrefix() + device.sysfsPath(), hascontent);
emit contentChanged(udi, hascontent);
}
// NOTE: this happens to be "change" event for an otherwise removed/untracked device (e.g.
// battery from power_supply) that is added now - the event is bogus (emitted by udev as if
// the device was not really removed) so it is fixed-up here
if (!wasofinterest) {
emit deviceAdded(udi);
}
}
}