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

[Linux] Correct handling of new dirs added to non-recursive watch roots

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2022-01-04 16:11:45 -08:00
parent 2bc1d8620e
commit 648a21ab5c
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
+18 -3
View File
@@ -176,10 +176,25 @@ void FileWatcher::WatchFolderLoop()
if (event->mask & (IN_CREATE | IN_MOVED_TO))
{
if (event->mask & IN_ISDIR /*&& m_recursive*/)
if (event->mask & IN_ISDIR)
{
// New Directory, add it to the watch
m_platformImpl->AddWatchFolder(pathStr, true);
// New Directory, see if it should be added to the watched directories
// It is only added if it is a child of a recursively watched directory
const auto found = AZStd::find_if(begin(m_folderWatchRoots), end(m_folderWatchRoots), [this, event](const WatchRoot& watchRoot)
{
return watchRoot.m_directory == m_platformImpl->m_handleToFolderMap[event->wd];
});
// If the path is not in m_folderWatchRoots, it must
// be a new subdirectory of a subdirectory of some
// other root that is being watched recursively.
// Maintain the recursive nature of that root.
const bool shouldAddFolder = (found == end(m_folderWatchRoots)) ? true : found->m_recursive;
if (shouldAddFolder)
{
m_platformImpl->AddWatchFolder(pathStr, true);
}
}
else
{