rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix race condition in dbus API

This commit is contained in:
Nicolas Werner 2022-07-11 15:14:30 +02:00
parent d5b06939fd
commit eeaf16e442
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/dbus/NhekoDBusBackend.cpp
View File

@ -4,6 +4,9 @@
#include "NhekoDBusBackend.h" #include "NhekoDBusBackend.h"
#include <mutex>
#include "Cache.h"
#include "Cache_p.h" #include "Cache_p.h"
#include "ChatPage.h" #include "ChatPage.h"
#include "Logging.h" #include "Logging.h"
@ -18,17 +21,35 @@ NhekoDBusBackend::NhekoDBusBackend(RoomlistModel *parent)
, m_parent{parent} , m_parent{parent}
{} {}
namespace {
struct RoomReplyState
{
QVector<nheko::dbus::RoomInfoItem> model;
std::map<QString, RoomInfo> roominfos;
std::recursive_mutex m;
};
}
QVector<nheko::dbus::RoomInfoItem> QVector<nheko::dbus::RoomInfoItem>
NhekoDBusBackend::rooms(const QDBusMessage &message) NhekoDBusBackend::rooms(const QDBusMessage &message)
{ {
message.setDelayedReply(true); message.setDelayedReply(true);
nhlog::ui()->debug("Rooms requested over D-Bus.");
const auto roomListModel = m_parent->models; const auto roomListModel = m_parent->models;
QSharedPointer<QVector<nheko::dbus::RoomInfoItem>> model{
new QVector<nheko::dbus::RoomInfoItem>};
auto state = QSharedPointer<RoomReplyState>::create();
std::vector<std::string> roomids;
roomids.reserve(roomids.size());
for (const auto &room : roomListModel) { for (const auto &room : roomListModel) {
auto addRoom = [room, roomListModelSize = roomListModel.size(), message, model]( roomids.push_back(room->roomId().toStdString());
}
state->roominfos = cache::getRoomInfo(roomids);
std::lock_guard<std::recursive_mutex> parentLock(state->m);
for (const auto &room : roomListModel) {
auto addRoom = [room, roomListModelSize = roomListModel.size(), message, state](
const QImage &image) { const QImage &image) {
const auto aliases = cache::client()->getStateEvent<mtx::events::state::CanonicalAlias>( const auto aliases = cache::client()->getStateEvent<mtx::events::state::CanonicalAlias>(
room->roomId().toStdString()); room->roomId().toStdString());
@ -41,24 +62,30 @@ NhekoDBusBackend::rooms(const QDBusMessage &message)
alias = QString::fromStdString(val.alt_aliases.front()); alias = QString::fromStdString(val.alt_aliases.front());
} }
model->push_back(nheko::dbus::RoomInfoItem{ state->model.push_back(nheko::dbus::RoomInfoItem{
room->roomId(), alias, room->roomName(), image, room->notificationCount()}); room->roomId(),
alias,
QString::fromStdString(state->roominfos[room->roomId()].name),
image,
room->notificationCount()});
if (model->length() == roomListModelSize) { std::lock_guard<std::recursive_mutex> childLock(state->m);
nhlog::ui()->debug("Sending {} rooms over D-Bus...", model->size()); if (state->model.size() == roomListModelSize) {
nhlog::ui()->debug("Sending {} rooms over D-Bus...", state->model.size());
auto reply = message.createReply(); auto reply = message.createReply();
reply << QVariant::fromValue(*model); reply << QVariant::fromValue(state->model);
QDBusConnection::sessionBus().send(reply); QDBusConnection::sessionBus().send(reply);
nhlog::ui()->debug("Rooms successfully sent to D-Bus."); nhlog::ui()->debug("Rooms successfully sent to D-Bus.");
} else {
// nhlog::ui()->debug("DBUS: {}/{}", state->model.size(), roomListModelSize);
} }
}; };
auto avatarUrl = room->roomAvatarUrl(); if (state->roominfos[room->roomId()].avatar_url.empty())
if (avatarUrl.isEmpty())
addRoom(QImage()); addRoom(QImage());
else else
MainWindow::instance()->imageProvider()->download( MainWindow::instance()->imageProvider()->download(
avatarUrl.remove("mxc://"), QString::fromStdString(state->roominfos[room->roomId()].avatar_url).remove("mxc://"),
{96, 96}, {96, 96},
[addRoom](const QString &, const QSize &, const QImage &image, const QString &) { [addRoom](const QString &, const QSize &, const QImage &image, const QString &) {
addRoom(image); addRoom(image);