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

Fix finding Syncthing dir by path on Windows 

The path needs to be normalized so inconsistent uses of `/` and `\` are not
a problem.
This commit is contained in:
Martchus 2023-08-19 19:16:16 +02:00
parent 652497d06e
commit 968fcb988c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncthingconnector/syncthingconnection.cpp
View File

@ -13,6 +13,7 @@
#include <c++utilities/io/ansiescapecodes.h>
#include <QAuthenticator>
#include <QDir>
#include <QHostAddress>
#include <QJsonArray>
#include <QJsonDocument>
@ -579,12 +580,14 @@ SyncthingDir *SyncthingConnection::findDirInfo(QLatin1String key, const QJsonObj
SyncthingDir *SyncthingConnection::findDirInfoByPath(const QString &path, QString &relativePath, int &row)
{
row = 0;
const auto cleanPath = QDir::cleanPath(path);
for (SyncthingDir &dir : m_dirs) {
if (path == dir.pathWithoutTrailingSlash()) {
const auto dirCleanPath = QDir::cleanPath(dir.path);
if (cleanPath == dirCleanPath) {
relativePath.clear();
return &dir;
} else if (path.startsWith(dir.path)) {
relativePath = path.mid(dir.path.size());
} else if (cleanPath.startsWith(dirCleanPath)) {
relativePath = cleanPath.mid(dirCleanPath.size());
return &dir;
}
++row;