birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Linux] Avoid recursive inotify when a watch folder is set to recursive=false

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-10-26 16:36:35 -07:00
parent daf4dbb54d
commit 04f4d5e031
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.h
+3 -2
View File
@@ -33,7 +33,7 @@ class FolderRootWatch
friend class FileWatcher;
public:
FolderRootWatch(const QString rootFolder);
FolderRootWatch(const QString rootFolder, bool recursive = true);
virtual ~FolderRootWatch();
void ProcessNewFileEvent(const QString& file);
@@ -54,6 +54,7 @@ private:
QMap<int, FolderWatchBase*> m_subFolderWatchesMap;
volatile bool m_shutdownThreadSignal;
FileWatcher* m_fileWatcher;
bool m_recursive;
// Can't use unique_ptr because this is a QObject and Qt's magic sauce is
// unable to determine the size of the unique_ptr and so fails to compile
@@ -76,7 +77,7 @@ public:
virtual ~FileWatcher();
//////////////////////////////////////////////////////////////////////////
virtual int AddFolderWatch(FolderWatchBase* pFolderWatch);
virtual int AddFolderWatch(FolderWatchBase* pFolderWatch, bool recursive = true);
virtual void RemoveFolderWatch(int handle);
//////////////////////////////////////////////////////////////////////////