From c6ff0d3030443647f3106796230f52b4739f4dfa Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Wed, 10 Apr 2024 14:50:26 +0200 Subject: [PATCH] Enhance error reporting for deleted files The code now checks if a requested file is present in the files list before diagnosing issues and generating error reports for it. It will help prevent attempting to diagnose or report on files that do not exist or deleted, thus enhancing efficiency and preventing possible error generation CURA-10903 --- .../src/printerlinter/linters/directory.py | 2 +- printer-linter/src/terminal.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/printer-linter/src/printerlinter/linters/directory.py b/printer-linter/src/printerlinter/linters/directory.py index d8626b1be4..e77cac96b9 100644 --- a/printer-linter/src/printerlinter/linters/directory.py +++ b/printer-linter/src/printerlinter/linters/directory.py @@ -35,5 +35,5 @@ class Directory(Linter): def checkFilesDeleted(self) -> Iterator[GitComment]: if not self._file.exists(): """ Check if there is a file that is deleted, this causes upgrade scripts to not work properly """ - yield GitComment( f"File: {self._file} must not be deleted as it is not allowed. It will create issues upgrading Cura" ) + yield GitComment( f'File: **{self._file}** must not be deleted as it is not allowed. It will create issues upgrading Cura' ) yield \ No newline at end of file diff --git a/printer-linter/src/terminal.py b/printer-linter/src/terminal.py index d8ef7a77cb..d93372571f 100644 --- a/printer-linter/src/terminal.py +++ b/printer-linter/src/terminal.py @@ -51,15 +51,16 @@ def main() -> None: if args.deleted: for file in args.Files: - deletedFiles = diagnoseIssuesWithFile(file, settings ) - comments_check["Error Files"].extend([d.toDict() for d in deletedFiles]) + if file not in files: + deletedFiles = diagnoseIssuesWithFile(file, settings) + comments_check["Error Files"].extend([d.toDict() for d in deletedFiles]) - results = yaml.dump(comments_check, default_flow_style=False, indent=4, width=240) + results = yaml.dump(comments_check, default_flow_style=False, indent=4, width=240) - if report: - report.write_text(results) - else: - print(results) + if report: + report.write_text(results) + else: + print(results) if to_fix or to_diagnose: for file in files: