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

Process 'ConfigSaved' events

This commit is contained in:
Martchus 2016-11-01 17:06:31 +01:00
parent ad5e724f44
commit 9e8a92c0ff
5 changed files with 101 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
connector/syncthingconnection.cpp
View File

@ -366,6 +366,28 @@ SyncthingDir *SyncthingConnection::findDirInfo(const QString &dirId, int &row)
return nullptr; // TODO: dir is unknown, trigger refreshing the config
}
/*!
* \brief Appends a directory info object with the specified \a dirId to \a dirs.
*
* If such an object already exists, it is recycled by moving it do \a dirs.
* Otherwise a new, empty object is created.
*
* \returns Returns the directory info object or nullptr if \a dirId is invalid.
*/
SyncthingDir *SyncthingConnection::addDirInfo(std::vector<SyncthingDir> &dirs, const QString &dirId)
{
if(dirId.isEmpty()) {
return nullptr;
}
int row;
if(SyncthingDir *existingDirInfo = findDirInfo(dirId, row)) {
dirs.emplace_back(move(*existingDirInfo));
} else {
dirs.emplace_back(dirId);
}
return &dirs.back();
}
/*!
* \brief Returns the device info object for the device with the specified ID.
* \returns Returns a pointer to the object or nullptr if not found.
@ -400,6 +422,28 @@ SyncthingDev *SyncthingConnection::findDevInfoByName(const QString &devName, int
return nullptr;
}
/*!
* \brief Appends a device info object with the specified \a devId to \a devs.
*
* If such an object already exists, it is recycled by moving it do \a dirs.
* Otherwise a new, empty object is created.
*
* \returns Returns the device info object or nullptr if \a devId is invalid.
*/
SyncthingDev *SyncthingConnection::addDevInfo(std::vector<SyncthingDev> &devs, const QString &devId)
{
if(devId.isEmpty()) {
return nullptr;
}
int row;
if(SyncthingDev *existingDevInfo = findDevInfo(devId, row)) {
devs.emplace_back(move(*existingDevInfo));
} else {
devs.emplace_back(devId);
}
return &devs.back();
}
/*!
* \brief Continues connecting if both - config and status - have been parsed yet and continuous polling is enabled.
*/
@ -659,7 +703,9 @@ void SyncthingConnection::readConfig()
readDirs(replyObj.value(QStringLiteral("folders")).toArray());
readDevs(replyObj.value(QStringLiteral("devices")).toArray());
m_hasConfig = true;
continueConnecting();
if(!isConnected()) {
continueConnecting();
}
} else {
emit error(tr("Unable to parse Syncthing config: ") + jsonError.errorString());
}
@ -680,30 +726,29 @@ void SyncthingConnection::readConfig()
*/
void SyncthingConnection::readDirs(const QJsonArray &dirs)
{
m_dirs.clear();
m_dirs.reserve(static_cast<size_t>(dirs.size()));
std::vector<SyncthingDir> newDirs;
newDirs.reserve(static_cast<size_t>(dirs.size()));
for(const QJsonValue &dirVal : dirs) {
const QJsonObject dirObj(dirVal.toObject());
SyncthingDir dirItem;
dirItem.id = dirObj.value(QStringLiteral("id")).toString();
if(!dirItem.id.isEmpty()) { // ignore dirs with empty id
dirItem.label = dirObj.value(QStringLiteral("label")).toString();
dirItem.path = dirObj.value(QStringLiteral("path")).toString();
if(SyncthingDir *dirItem = addDirInfo(newDirs, dirObj.value(QStringLiteral("id")).toString())) {
dirItem->label = dirObj.value(QStringLiteral("label")).toString();
dirItem->path = dirObj.value(QStringLiteral("path")).toString();
dirItem->devices.clear();
for(const QJsonValue &dev : dirObj.value(QStringLiteral("devices")).toArray()) {
const QString devId = dev.toObject().value(QStringLiteral("deviceID")).toString();
if(!devId.isEmpty()) {
dirItem.devices << devId;
dirItem->devices << devId;
}
}
dirItem.readOnly = dirObj.value(QStringLiteral("readOnly")).toBool(false);
dirItem.rescanInterval = dirObj.value(QStringLiteral("rescanIntervalS")).toInt(-1);
dirItem.ignorePermissions = dirObj.value(QStringLiteral("ignorePerms")).toBool(false);
dirItem.autoNormalize = dirObj.value(QStringLiteral("autoNormalize")).toBool(false);
dirItem.minDiskFreePercentage = dirObj.value(QStringLiteral("minDiskFreePct")).toInt(-1);
m_dirs.emplace_back(move(dirItem));
dirItem->readOnly = dirObj.value(QStringLiteral("readOnly")).toBool(false);
dirItem->rescanInterval = dirObj.value(QStringLiteral("rescanIntervalS")).toInt(-1);
dirItem->ignorePermissions = dirObj.value(QStringLiteral("ignorePerms")).toBool(false);
dirItem->autoNormalize = dirObj.value(QStringLiteral("autoNormalize")).toBool(false);
dirItem->minDiskFreePercentage = dirObj.value(QStringLiteral("minDiskFreePct")).toInt(-1);
}
}
emit newDirs(m_dirs);
m_dirs.swap(newDirs);
emit this->newDirs(m_dirs);
}
/*!
@ -711,25 +756,24 @@ void SyncthingConnection::readDirs(const QJsonArray &dirs)
*/
void SyncthingConnection::readDevs(const QJsonArray &devs)
{
m_devs.clear();
m_devs.reserve(static_cast<size_t>(devs.size()));
vector<SyncthingDev> newDevs;
newDevs.reserve(static_cast<size_t>(devs.size()));
for(const QJsonValue &devVal: devs) {
const QJsonObject devObj(devVal.toObject());
SyncthingDev devItem;
devItem.id = devObj.value(QStringLiteral("deviceID")).toString();
if(!devItem.id.isEmpty()) { // ignore dirs with empty id
devItem.name = devObj.value(QStringLiteral("name")).toString();
if(SyncthingDev *devItem = addDevInfo(newDevs, devObj.value(QStringLiteral("deviceID")).toString())) {
devItem->name = devObj.value(QStringLiteral("name")).toString();
devItem->addresses.clear();
for(const QJsonValue &addrVal : devObj.value(QStringLiteral("addresses")).toArray()) {
devItem.addresses << addrVal.toString();
devItem->addresses << addrVal.toString();
}
devItem.compression = devObj.value(QStringLiteral("compression")).toString();
devItem.certName = devObj.value(QStringLiteral("certName")).toString();
devItem.introducer = devObj.value(QStringLiteral("introducer")).toBool(false);
devItem.status = devItem.id == m_myId ? SyncthingDevStatus::OwnDevice : SyncthingDevStatus::Unknown;
m_devs.push_back(move(devItem));
devItem->compression = devObj.value(QStringLiteral("compression")).toString();
devItem->certName = devObj.value(QStringLiteral("certName")).toString();
devItem->introducer = devObj.value(QStringLiteral("introducer")).toBool(false);
devItem->status = devItem->id == m_myId ? SyncthingDevStatus::OwnDevice : SyncthingDevStatus::Unknown;
}
}
emit newDevices(m_devs);
m_devs.swap(newDevs);
emit this->newDevices(m_devs);
}
/*!
@ -1052,6 +1096,8 @@ void SyncthingConnection::readEvents()
readItemStarted(eventTime, eventData);
} else if(eventType == QLatin1String("ItemFinished")) {
readItemFinished(eventTime, eventData);
} else if(eventType == QLatin1String("ConfigSaved")) {
requestConfig(); // just consider current config as invalidated
}
}
} else {
@ -1119,9 +1165,17 @@ void SyncthingConnection::readStatusChangedEvent(DateTime eventTime, const QJson
// dir status changed
int index;
if(SyncthingDir *dirInfo = findDirInfo(dir, index)) {
// directory is already known -> just update status
if(dirInfo->assignStatus(eventData.value(QStringLiteral("to")).toString(), eventTime)) {
emit dirStatusChanged(*dirInfo, index);
}
} else {
// the directory is unknown
// -> add new directory
m_dirs.emplace_back(dir);
m_dirs.back().assignStatus(eventData.value(QStringLiteral("to")).toString(), eventTime);
// -> request config for complete meta data of new directory
requestConfig();
}
}
}

2
connector/syncthingconnection.h
View File

@ -178,6 +178,8 @@ private:
QNetworkRequest prepareRequest(const QString &path, const QUrlQuery &query, bool rest = true);
QNetworkReply *requestData(const QString &path, const QUrlQuery &query, bool rest = true);
QNetworkReply *postData(const QString &path, const QUrlQuery &query, const QByteArray &data = QByteArray());
SyncthingDir *addDirInfo(std::vector<SyncthingDir> &dirs, const QString &dirId);
SyncthingDev *addDevInfo(std::vector<SyncthingDev> &devs, const QString &devId);
QString m_syncthingUrl;
QByteArray m_apiKey;

6
connector/syncthingdev.h
View File

@ -23,6 +23,7 @@ enum class SyncthingDevStatus
struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDev
{
SyncthingDev(const QString &id = QString(), const QString &name = QString());
QString id;
QString name;
QStringList addresses;
@ -41,6 +42,11 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDev
ChronoUtilities::DateTime lastSeen;
};
inline SyncthingDev::SyncthingDev(const QString &id, const QString &name) :
id(id),
name(name)
{}
} // namespace Data
#endif // DATA_SYNCTHINGDEV_H

13
connector/syncthingdir.h
View File

@ -60,6 +60,10 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingItemDownloadProgress
struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir
{
SyncthingDir(const QString &id = QString(), const QString &label = QString(), const QString &path = QString());
bool assignStatus(const QString &statusStr, ChronoUtilities::DateTime time);
bool assignStatus(SyncthingDirStatus newStatus, ChronoUtilities::DateTime time);
QString id;
QString label;
QString path;
@ -87,11 +91,14 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir
int blocksToBeDownloaded = 0;
unsigned int downloadPercentage = 0;
QString downloadLabel;
bool assignStatus(const QString &statusStr, ChronoUtilities::DateTime time);
bool assignStatus(SyncthingDirStatus newStatus, ChronoUtilities::DateTime time);
};
inline SyncthingDir::SyncthingDir(const QString &id, const QString &label, const QString &path) :
id(id),
label(label),
path(path)
{}
} // namespace Data
#endif // DATA_SYNCTHINGDIR_H

1
tray/gui/devbuttonsitemdelegate.cpp
View File

@ -42,7 +42,6 @@ void DevButtonsItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
// draw text
QRectF textRect = option.rect;
//textRect.setWidth(textRect.width() - 38);
textRect.setWidth(textRect.width() - 20);
QTextOption textOption;
textOption.setAlignment(opt.displayAlignment);