3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: suppress "root_update" notifications during init 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-02-04 19:11:20 -05:00
parent 47f0437973
commit 0f7af929f1
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
moonraker/components/file_manager/file_manager.py
View File

@ -112,6 +112,9 @@ class FileManager:
if gc_path: if gc_path:
self.register_directory('gcodes', gc_path, full_access=True) self.register_directory('gcodes', gc_path, full_access=True)
async def component_init(self):
self.inotify_handler.initalize_roots()
def _update_fixed_paths(self) -> None: def _update_fixed_paths(self) -> None:
kinfo = self.server.get_klippy_info() kinfo = self.server.get_klippy_info()
paths: Dict[str, Any] = \ paths: Dict[str, Any] = \
@ -176,7 +179,7 @@ class FileManager:
if full_access: if full_access:
# Refresh the file list and add watches # Refresh the file list and add watches
self.inotify_handler.add_root_watch(root, path) self.inotify_handler.add_root_watch(root, path)
else: elif self.server.is_running():
self.event_loop.register_callback( self.event_loop.register_callback(
self.inotify_handler.notify_filelist_changed, self.inotify_handler.notify_filelist_changed,
"root_update", root, path) "root_update", root, path)
@ -1071,7 +1074,7 @@ class INotifyHandler:
self.pending_moves: Dict[ self.pending_moves: Dict[
int, Tuple[InotifyNode, str, asyncio.Handle]] = {} int, Tuple[InotifyNode, str, asyncio.Handle]] = {}
self.create_gcode_notifications: Dict[str, Any] = {} self.create_gcode_notifications: Dict[str, Any] = {}
self.initialized: bool = False
def add_root_watch(self, root: str, root_path: str) -> None: def add_root_watch(self, root: str, root_path: str) -> None:
# remove all exisiting watches on root # remove all exisiting watches on root
@ -1081,10 +1084,23 @@ class INotifyHandler:
old_root.clear_events() old_root.clear_events()
root_node = InotifyRootNode(self, root, root_path) root_node = InotifyRootNode(self, root, root_path)
self.watched_roots[root] = root_node self.watched_roots[root] = root_node
mevts = root_node.scan_node() if self.initialized:
self.log_nodes() mevts = root_node.scan_node()
self.event_loop.register_callback( self.log_nodes()
self._notify_root_updated, mevts, root, root_path) self.event_loop.register_callback(
self._notify_root_updated, mevts, root, root_path)
def initalize_roots(self):
for root, node in self.watched_roots.items():
evts = node.scan_node()
if not evts:
continue
root_path = node.get_path()
self.event_loop.register_callback(
self._notify_root_updated, evts, root, root_path)
if self.watched_roots:
self.log_nodes()
self.initialized = True
async def _notify_root_updated(self, async def _notify_root_updated(self,
mevts: List[asyncio.Event], mevts: List[asyncio.Event],
@ -1094,7 +1110,9 @@ class INotifyHandler:
if mevts: if mevts:
mfuts = [e.wait() for e in mevts] mfuts = [e.wait() for e in mevts]
await asyncio.gather(*mfuts) await asyncio.gather(*mfuts)
self.notify_filelist_changed("root_update", root, root_path) cur_path = self.watched_roots[root].get_path()
if self.server.is_running() and cur_path == root_path:
self.notify_filelist_changed("root_update", root, root_path)
def add_watch(self, node: InotifyNode) -> int: def add_watch(self, node: InotifyNode) -> int:
dir_path = node.get_path() dir_path = node.get_path()