mirror of
https://github.com/nextcloud/desktop.git
synced 2025-10-26 11:17:43 +00:00
dfb121236c
Previously, we only checked the hiddenness of the target file and ignored the hiddenness of the containing folders. This lead to undesired behavior when people synced their home folders and there was a folder watcher notification for a non-hidden file in one of the hidden folders. I'm not fully sure why, but sometimes notifications for .foo/bar were already ignored, but notifications for .foo/bar/car were not. This may be because of how we set up the FolderWatchers on Linux. The new behavior is to check all path components for hiddenness, up until the base path (but excluding the base path, so using a hidden folder as a sync folder will work).
107 lines
2.7 KiB
C++
107 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) by Christian Kamm <mail@ckamm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*/
|
|
|
|
#include "excludedfiles.h"
|
|
#include "utility.h"
|
|
|
|
#include <QFileInfo>
|
|
|
|
extern "C" {
|
|
#include "std/c_string.h"
|
|
#include "csync.h"
|
|
#include "csync_exclude.h"
|
|
}
|
|
|
|
using namespace OCC;
|
|
|
|
ExcludedFiles::ExcludedFiles(c_strlist_t** excludesPtr)
|
|
: _excludesPtr(excludesPtr)
|
|
{
|
|
}
|
|
|
|
ExcludedFiles::~ExcludedFiles()
|
|
{
|
|
c_strlist_destroy(*_excludesPtr);
|
|
}
|
|
|
|
ExcludedFiles& ExcludedFiles::instance()
|
|
{
|
|
static c_strlist_t* globalExcludes;
|
|
static ExcludedFiles inst(&globalExcludes);
|
|
return inst;
|
|
}
|
|
|
|
void ExcludedFiles::addExcludeFilePath(const QString& path)
|
|
{
|
|
_excludeFiles.insert(path);
|
|
}
|
|
|
|
#ifdef WITH_UNIT_TESTING
|
|
void ExcludedFiles::addExcludeExpr(const QString &expr)
|
|
{
|
|
_csync_exclude_add(_excludesPtr, expr.toLatin1().constData());
|
|
}
|
|
#endif
|
|
|
|
bool ExcludedFiles::reloadExcludes()
|
|
{
|
|
c_strlist_destroy(*_excludesPtr);
|
|
*_excludesPtr = NULL;
|
|
|
|
bool success = true;
|
|
foreach (const QString& file, _excludeFiles) {
|
|
if (csync_exclude_load(file.toUtf8(), _excludesPtr) < 0)
|
|
success = false;
|
|
}
|
|
return success;
|
|
}
|
|
|
|
bool ExcludedFiles::isExcluded(
|
|
const QString& filePath,
|
|
const QString& basePath,
|
|
bool excludeHidden) const
|
|
{
|
|
if (!filePath.startsWith(basePath, Utility::fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive)) {
|
|
// Mark paths we're not responsible for as excluded...
|
|
return true;
|
|
}
|
|
|
|
if( excludeHidden ) {
|
|
QString path = filePath;
|
|
// Check all path subcomponents, but to *not* check the base path:
|
|
// We do want to be able to sync with a hidden folder as the target.
|
|
while (path.size() > basePath.size()) {
|
|
QFileInfo fi(path);
|
|
if( fi.isHidden() || fi.fileName().startsWith(QLatin1Char('.')) ) {
|
|
return true;
|
|
}
|
|
|
|
// Get the parent path
|
|
path = fi.absolutePath();
|
|
}
|
|
}
|
|
|
|
QFileInfo fi(filePath);
|
|
csync_ftw_type_e type = CSYNC_FTW_TYPE_FILE;
|
|
if (fi.isDir()) {
|
|
type = CSYNC_FTW_TYPE_DIR;
|
|
}
|
|
|
|
QString relativePath = filePath.mid(basePath.size());
|
|
if (relativePath.endsWith(QLatin1Char('/'))) {
|
|
relativePath.chop(1);
|
|
}
|
|
|
|
return csync_excluded_no_ctx(*_excludesPtr, relativePath.toUtf8(), type) != CSYNC_NOT_EXCLUDED;
|
|
}
|