tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve DevicesModel::receivedDeviceList

Browse source 
Make the population asynchronous on dbus. Wait for the device list and
don't populate it until it's ready. There's no reason to block.
Don't emit after endInsertRows. It doesn't help, as the views will have
already refreshed.
This commit is contained in:
Aleix Pol 2015-03-14 02:30:35 +01:00
parent 128241c95c
commit 7af7dbdc2f
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
interfaces/devicesmodel.cpp
View file

@ -100,13 +100,8 @@ void DevicesModel::setDisplayFilter(int flags)
void DevicesModel::refreshDeviceList() void DevicesModel::refreshDeviceList()
{ {
if (!m_deviceList.isEmpty()) {
beginRemoveRows(QModelIndex(), 0, m_deviceList.size() - 1);
m_deviceList.clear();
endRemoveRows();
}
if (!m_dbusInterface->isValid()) { if (!m_dbusInterface->isValid()) {
clearDevices();
qCDebug(KDECONNECT_INTERFACES) << "dbus interface not valid"; qCDebug(KDECONNECT_INTERFACES) << "dbus interface not valid";
return; return;
} }
@ -115,22 +110,39 @@ void DevicesModel::refreshDeviceList()
bool onlyReachable = (m_displayFilter & StatusReachable); bool onlyReachable = (m_displayFilter & StatusReachable);
QDBusPendingReply<QStringList> pendingDeviceIds = m_dbusInterface->devices(onlyReachable, onlyPaired); QDBusPendingReply<QStringList> pendingDeviceIds = m_dbusInterface->devices(onlyReachable, onlyPaired);
pendingDeviceIds.waitForFinished(); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingDeviceIds, this);
QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
this, SLOT(receivedDeviceList(QDBusPendingCallWatcher*)));
}
void DevicesModel::receivedDeviceList(QDBusPendingCallWatcher* watcher)
{
clearDevices();
QDBusPendingReply<QStringList> pendingDeviceIds = *watcher;
if (pendingDeviceIds.isError()) { if (pendingDeviceIds.isError()) {
qCDebug(KDECONNECT_INTERFACES) << pendingDeviceIds.error(); qCDebug(KDECONNECT_INTERFACES) << pendingDeviceIds.error();
return; return;
} }
const QStringList& deviceIds = pendingDeviceIds.value(); Q_ASSERT(m_deviceList.isEmpty());
const QStringList deviceIds = pendingDeviceIds.value();
beginInsertRows(QModelIndex(), 0, deviceIds.count());
Q_FOREACH(const QString& id, deviceIds) { Q_FOREACH(const QString& id, deviceIds) {
int firstRow = m_deviceList.size(); m_deviceList.append(new DeviceDbusInterface(id, this));
int lastRow = firstRow;
beginInsertRows(QModelIndex(), firstRow, lastRow);
m_deviceList.append(new DeviceDbusInterface(id,this));
endInsertRows();
} }
endInsertRows();
watcher->deleteLater();
}
Q_EMIT dataChanged(index(0), index(m_deviceList.size())); void DevicesModel::clearDevices()
{
if (!m_deviceList.isEmpty()) {
beginRemoveRows(QModelIndex(), 0, m_deviceList.size() - 1);
qDeleteAll(m_deviceList);
m_deviceList.clear();
endRemoveRows();
}
} }
QVariant DevicesModel::data(const QModelIndex& index, int role) const QVariant DevicesModel::data(const QModelIndex& index, int role) const

5
interfaces/devicesmodel.h
View file

@ -21,13 +21,13 @@
#ifndef DEVICESMODEL_H #ifndef DEVICESMODEL_H
#define DEVICESMODEL_H #define DEVICESMODEL_H
#include <QAbstractItemModel>
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QPixmap> #include <QPixmap>
#include <QList> #include <QList>
#include "interfaces/kdeconnectinterfaces_export.h" #include "interfaces/kdeconnectinterfaces_export.h"
class QDBusPendingCallWatcher;
class DaemonDbusInterface; class DaemonDbusInterface;
class DeviceDbusInterface; class DeviceDbusInterface;
@ -74,11 +74,14 @@ private Q_SLOTS:
void deviceAdded(const QString& id); void deviceAdded(const QString& id);
void deviceRemoved(const QString& id); void deviceRemoved(const QString& id);
void refreshDeviceList(); void refreshDeviceList();
void receivedDeviceList(QDBusPendingCallWatcher* watcher);
Q_SIGNALS: Q_SIGNALS:
void rowsChanged(); void rowsChanged();
private: private:
void clearDevices();
DaemonDbusInterface* m_dbusInterface; DaemonDbusInterface* m_dbusInterface;
QList<DeviceDbusInterface*> m_deviceList; QList<DeviceDbusInterface*> m_deviceList;
StatusFlags m_displayFilter; StatusFlags m_displayFilter;