mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

FolderWatcher: Act on relative paths #5116 (#5153)

Browse source
This commit is contained in:
Markus Goetz 2016-09-12 14:03:11 +02:00 committed by ckamm
parent 1d09f6b60f
commit d5a481f132
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/folder.cpp
View file

@ -621,11 +621,6 @@ void Folder::removeFromSettings() const
settings->remove(FolderMan::escapeAlias(_definition.alias)); settings->remove(FolderMan::escapeAlias(_definition.alias));
} }
bool Folder::isFileExcludedAbsolute(const QString& fullPath) const
{
return _engine->excludedFiles().isExcluded(fullPath, path(), _definition.ignoreHiddenFiles);
}
bool Folder::isFileExcludedRelative(const QString& relativePath) const bool Folder::isFileExcludedRelative(const QString& relativePath) const
{ {
return _engine->excludedFiles().isExcluded(path() + relativePath, path(), _definition.ignoreHiddenFiles); return _engine->excludedFiles().isExcluded(path() + relativePath, path(), _definition.ignoreHiddenFiles);

5
src/gui/folder.h
View file

@ -184,11 +184,6 @@ public:
/// Removes the folder from the account's settings. /// Removes the folder from the account's settings.
void removeFromSettings() const; void removeFromSettings() const;
/**
* Returns whether a file inside this folder should be excluded.
*/
bool isFileExcludedAbsolute(const QString& fullPath) const;
/** /**
* Returns whether a file inside this folder should be excluded. * Returns whether a file inside this folder should be excluded.
*/ */

15
src/gui/folderwatcher.cpp
View file

@ -41,7 +41,9 @@ FolderWatcher::FolderWatcher(const QString &root, Folder* folder)
: QObject(folder), : QObject(folder),
_folder(folder) _folder(folder)
{ {
_d.reset(new FolderWatcherPrivate(this, root)); _canonicalFolderPath = QFileInfo(root).canonicalFilePath();
_d.reset(new FolderWatcherPrivate(this, _canonicalFolderPath));
_timer.start(); _timer.start();
} }
@ -55,10 +57,17 @@ bool FolderWatcher::pathIsIgnored( const QString& path )
if( !_folder ) return false; if( !_folder ) return false;
#ifndef OWNCLOUD_TEST #ifndef OWNCLOUD_TEST
if (_folder->isFileExcludedAbsolute(path)) { QString relPath = path;
qDebug() << "* Ignoring file" << path; if (relPath.startsWith(_canonicalFolderPath)) {
relPath = relPath.remove(0, _canonicalFolderPath.length()+1);
if (_folder->isFileExcludedRelative(relPath)) {
qDebug() << "* Ignoring file" << relPath << "in" << _canonicalFolderPath;
return true; return true;
} }
}
// there could be an odd watch event not being inside the _canonicalFolderPath
// We will just not ignore it then, who knows.
#endif #endif
return false; return false;
} }

1
src/gui/folderwatcher.h
View file

@ -89,6 +89,7 @@ private:
QTime _timer; QTime _timer;
QSet<QString> _lastPaths; QSet<QString> _lastPaths;
Folder* _folder; Folder* _folder;
QString _canonicalFolderPath;
friend class FolderWatcherPrivate; friend class FolderWatcherPrivate;
}; };