mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

selective sync: fix whitelist matching

Browse Source
This commit is contained in:
Olivier Goffart 2014-08-12 11:43:42 +02:00
parent b25ef28e82
commit 12459bf07e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
csync/src/csync_exclude.c
View File

@ -311,8 +311,8 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
}
if (match == CSYNC_NOT_EXCLUDED && ctx->checkWhiteListHook) {
if (ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) {
match = CSYNC_FILE_SILENTLY_EXCLUDED;
if (!ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) {
match = CSYNC_FILE_EXCLUDE_LIST;
}
}

12
src/mirall/discoveryphase.cpp
View File

@ -14,8 +14,9 @@
#include "discoveryphase.h"
#include <csync_private.h>
#include <qdebug.h>
bool DiscoveryJob::isInWhiteList(const QString& path_) const
bool DiscoveryJob::isInWhiteList(const QString& path) const
{
if (_selectiveSyncWhiteList.isEmpty()) {
// If there is no white list, everything is allowed
@ -32,10 +33,10 @@ bool DiscoveryJob::isInWhiteList(const QString& path_) const
// equal, or right after in the lexical order.
// If an item has the path as a prefix, it will be right before in the lexicographic order.
QString path = path_ + QLatin1Char('/');
QString pathSlash = path + QLatin1Char('/');
auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), path);
if (it != _selectiveSyncWhiteList.end() && path.startsWith(*it)) {
auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), pathSlash);
if (it != _selectiveSyncWhiteList.end() && (*it + QLatin1Char('/')).startsWith(pathSlash)) {
// If the path is a prefix of something in the white list, we need to sync the contents
return true;
}
@ -45,10 +46,9 @@ bool DiscoveryJob::isInWhiteList(const QString& path_) const
return false;
}
--it;
if ((*it).startsWith(path)) {
if (pathSlash.startsWith(*it + QLatin1Char('/'))) {
return true;
}
return false;
}