CreatBot/CreatBotMoonraker
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: remove child watches when a directory is stale

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-21 20:01:48 -04:00 committed by Eric Callahan
parent bb00825cd2
commit 9c31a360ee
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/components/file_manager.py
View File

@ -626,6 +626,8 @@ class INotifyHandler:
f"delete_{item_type}", root, item_path) f"delete_{item_type}", root, item_path)
def _remove_stale_cookie(self, cookie): def _remove_stale_cookie(self, cookie):
# This is a file or directory moved out of a watched parent.
# We treat this as a deleted file/directory.
pending_evt = self.pending_move_events.pop(cookie, None) pending_evt = self.pending_move_events.pop(cookie, None)
if pending_evt is None: if pending_evt is None:
# Event already processed # Event already processed
@ -636,7 +638,11 @@ class INotifyHandler:
item_type = "file" item_type = "file"
if is_dir: if is_dir:
item_type = "dir" item_type = "dir"
self.remove_watch(prev_path) for wpath in list(self.watches.keys()):
if wpath.startswith(prev_path):
self.remove_watch(wpath)
# Metadata should have been cleared in the MOVE_TO event,
# so no need to clear it here
self._notify_filelist_changed( self._notify_filelist_changed(
f"delete_{item_type}", prev_root, prev_path) f"delete_{item_type}", prev_root, prev_path)