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

file_manager: handle situations where file transfer is corrupt 

The addition of inotify can introduce scenarios where file transfers complete abruptly, resulting in a corrupt/incomplete file.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-05-26 06:18:41 -04:00
parent fc5420db27
commit 2db727e40f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
moonraker/components/file_manager.py
View File

@ -1113,7 +1113,14 @@ class INotifyHandler:
def parse_gcode_metadata(self, file_path: str) -> Event: def parse_gcode_metadata(self, file_path: str) -> Event:
rel_path = self.file_manager.get_relative_path("gcodes", file_path) rel_path = self.file_manager.get_relative_path("gcodes", file_path)
path_info = self.file_manager.get_path_info(file_path) try:
path_info = self.file_manager.get_path_info(file_path)
except Exception:
logging.exception(
f"Error retreiving path info for file {file_path}")
evt = Event()
evt.set()
return evt
ext = os.path.splitext(file_path)[-1].lower() ext = os.path.splitext(file_path)[-1].lower()
if ext == ".ufp": if ext == ".ufp":
rel_path = os.path.splitext(rel_path)[0] + ".gcode" rel_path = os.path.splitext(rel_path)[0] + ".gcode"
@ -1280,8 +1287,14 @@ class INotifyHandler:
) -> None: ) -> None:
rel_path = self.file_manager.get_relative_path(root, full_path) rel_path = self.file_manager.get_relative_path(root, full_path)
file_info: Dict[str, Any] = {'size': 0, 'modified': 0} file_info: Dict[str, Any] = {'size': 0, 'modified': 0}
is_valid = True
if os.path.exists(full_path): if os.path.exists(full_path):
file_info = self.file_manager.get_path_info(full_path) try:
file_info = self.file_manager.get_path_info(full_path)
except Exception:
is_valid = False
elif action not in ["delete_file", "delete_dir"]:
is_valid = False
file_info['path'] = rel_path file_info['path'] = rel_path
file_info['root'] = root file_info['root'] = root
result = {'action': action, 'item': file_info} result = {'action': action, 'item': file_info}
@ -1294,16 +1307,18 @@ class INotifyHandler:
# Delay this notification so that it occurs after an item # Delay this notification so that it occurs after an item
logging.debug(f"Syncing notification: {full_path}") logging.debug(f"Syncing notification: {full_path}")
IOLoop.current().spawn_callback( IOLoop.current().spawn_callback(
self._delay_notification, result, sync_lock.sync(full_path)) self._sync_with_request, result,
elif self._check_need_notify(file_info): sync_lock.sync(full_path), is_valid)
elif is_valid and self._check_need_notify(file_info):
self.server.send_event("file_manager:filelist_changed", result) self.server.send_event("file_manager:filelist_changed", result)
async def _delay_notification(self, async def _sync_with_request(self,
result: Dict[str, Any], result: Dict[str, Any],
sync_fut: Coroutine sync_fut: Coroutine,
) -> None: is_valid: bool
) -> None:
await sync_fut await sync_fut
if self._check_need_notify(result['item']): if is_valid and self._check_need_notify(result['item']):
self.server.send_event("file_manager:filelist_changed", result) self.server.send_event("file_manager:filelist_changed", result)
def _check_need_notify(self, file_info: Dict[str, Any]) -> bool: def _check_need_notify(self, file_info: Dict[str, Any]) -> bool: