Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply clang- and cmake-format

This commit is contained in:
Martchus 2024-05-18 13:09:06 +02:00
parent 96578c335d
commit 4b405a1723
2 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncthingmodel/CMakeLists.txt
View File

@ -59,7 +59,14 @@ find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUF
use_qt_fork_awesome(VISIBILITY PUBLIC)
# link also explicitly against the following Qt modules
list(APPEND ADDITIONAL_QT_MODULES Concurrent Network Gui Widgets Svg)
list(
APPEND
ADDITIONAL_QT_MODULES
Concurrent
Network
Gui
Widgets
Svg)
# include modules to apply configuration
include(BasicConfig)

79
syncthingmodel/syncthingfilemodel.cpp
View File

@ -10,10 +10,10 @@
#include <c++utilities/conversion/stringconversion.h>
#include <QClipboard>
#include <QtConcurrent>
#include <QGuiApplication>
#include <QNetworkReply>
#include <QStringBuilder>
#include <QtConcurrent>
using namespace std;
using namespace CppUtilities;
@ -404,45 +404,46 @@ void SyncthingFileModel::processFetchQueue(const QString &lastItemPath)
// query directory entries from Syncthing database
if (rootItem->existsInDb) {
m_pendingRequest = m_connection.browse(
m_dirId, path, 1, [this](std::vector<std::unique_ptr<SyncthingItem>> &&items, QString &&errorMessage) mutable {
m_pendingRequest.reply = nullptr;
addErrorItem(items, std::move(errorMessage));
m_pendingRequest
= m_connection.browse(m_dirId, path, 1, [this](std::vector<std::unique_ptr<SyncthingItem>> &&items, QString &&errorMessage) mutable {
m_pendingRequest.reply = nullptr;
addErrorItem(items, std::move(errorMessage));
const auto refreshedIndex = index(m_pendingRequest.forPath);
if (!refreshedIndex.isValid()) {
processFetchQueue(m_pendingRequest.forPath);
return;
}
auto *const refreshedItem = reinterpret_cast<SyncthingItem *>(refreshedIndex.internalPointer());
const auto previousChildCount = refreshedItem->children.size();
if (previousChildCount) {
beginRemoveRows(refreshedIndex, 0, static_cast<int>(refreshedItem->children.size() - 1));
refreshedItem->children.clear();
endRemoveRows();
}
if (!items.empty()) {
const auto last = items.size() - 1;
for (auto &item : items) {
item->parent = refreshedItem;
}
populatePath(refreshedItem->path, items);
beginInsertRows(refreshedIndex, 0, last < std::numeric_limits<int>::max() ? static_cast<int>(last) : std::numeric_limits<int>::max());
refreshedItem->children = std::move(items);
refreshedItem->childrenPopulated = true;
endInsertRows();
}
if (refreshedItem->children.size() != previousChildCount) {
const auto sizeIndex = refreshedIndex.siblingAtColumn(1);
emit dataChanged(sizeIndex, sizeIndex, QVector<int>{ Qt::DisplayRole });
}
if (!m_pendingRequest.localLookup.isCanceled()) {
m_pendingRequest.refreshedIndex = refreshedIndex;
m_localItemLookup.setFuture(m_pendingRequest.localLookup);
} else {
processFetchQueue(m_pendingRequest.forPath);
}
});
const auto refreshedIndex = index(m_pendingRequest.forPath);
if (!refreshedIndex.isValid()) {
processFetchQueue(m_pendingRequest.forPath);
return;
}
auto *const refreshedItem = reinterpret_cast<SyncthingItem *>(refreshedIndex.internalPointer());
const auto previousChildCount = refreshedItem->children.size();
if (previousChildCount) {
beginRemoveRows(refreshedIndex, 0, static_cast<int>(refreshedItem->children.size() - 1));
refreshedItem->children.clear();
endRemoveRows();
}
if (!items.empty()) {
const auto last = items.size() - 1;
for (auto &item : items) {
item->parent = refreshedItem;
}
populatePath(refreshedItem->path, items);
beginInsertRows(
refreshedIndex, 0, last < std::numeric_limits<int>::max() ? static_cast<int>(last) : std::numeric_limits<int>::max());
refreshedItem->children = std::move(items);
refreshedItem->childrenPopulated = true;
endInsertRows();
}
if (refreshedItem->children.size() != previousChildCount) {
const auto sizeIndex = refreshedIndex.siblingAtColumn(1);
emit dataChanged(sizeIndex, sizeIndex, QVector<int>{ Qt::DisplayRole });
}
if (!m_pendingRequest.localLookup.isCanceled()) {
m_pendingRequest.refreshedIndex = refreshedIndex;
m_localItemLookup.setFuture(m_pendingRequest.localLookup);
} else {
processFetchQueue(m_pendingRequest.forPath);
}
});
} else {
m_pendingRequest = SyncthingConnection::QueryResult();
}