Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle deletion of watched directories in wxFileSystemWatcher sample.

Browse Source 
Don't assert when trying to stop watching a directory that doesn't exist any
more later.

See #14544.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-15 01:10:12 +00:00
parent 0f306261b8
commit 0b3ef556f5
1 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
samples/fswatcher/fswatcher.cpp
View File

@@ -420,6 +420,60 @@ void MyFrame::OnFileSystemEvent(wxFileSystemWatcherEvent& event)
// TODO remove when code is rock-solid
wxLogTrace(wxTRACE_FSWATCHER, "*** %s ***", event.ToString());
LogEvent(event);
int type = event.GetChangeType();
if ((type == wxFSW_EVENT_DELETE) || (type == wxFSW_EVENT_RENAME))
{
// If path is one of our watched dirs, we need to react to this
// otherwise there'll be asserts if later we try to remove it
wxString eventpath = event.GetPath().GetFullPath();
bool found(false);
for (size_t n = m_filesList->GetItemCount(); n > 0; --n)
{
wxString path, foo = m_filesList->GetItemText(n-1);
if ((!m_filesList->GetItemText(n-1).StartsWith("Dir: ", &path)) &&
(!m_filesList->GetItemText(n-1).StartsWith("Tree: ", &path)))
{
wxFAIL_MSG("Unexpected item in wxListView.");
}
if (path == eventpath)
{
if (type == wxFSW_EVENT_DELETE)
{
m_filesList->DeleteItem(n-1);
}
else
{
// At least in wxGTK, we'll never get here: renaming the top
// watched dir gives IN_MOVE_SELF and no new-name info.
// However I'll leave the code in case other platforms do
wxString newname = event.GetNewPath().GetFullPath();
if (newname.empty() ||
newname == event.GetPath().GetFullPath())
{
// Just in case either of these are possible...
wxLogTrace(wxTRACE_FSWATCHER,
"Invalid attempt to rename to %s", newname);
return;
}
wxString prefix =
m_filesList->GetItemText(n-1).StartsWith("Dir: ") ?
"Dir: " : "Tree: ";
m_filesList->SetItemText(n-1, prefix + newname);
}
found = true;
// Don't break: a filepath may have been added more than once
}
}
if (found)
{
wxString msg = wxString::Format(
"Your watched path %s has been deleted or renamed\n",
eventpath);
m_evtConsole->AppendText(msg);
}
}
}