From 0c658ccbc502817202839b258812e4281dc43255 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 17:04:26 +0200 Subject: [PATCH 1/4] Reads the conan_install_info int ApplicationMetadata Contributes to CURA-9365 --- cura/ApplicationMetadata.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 78bda7c3d7..007b4e2813 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -60,3 +60,14 @@ try: except ImportError: CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME + +DEPENDENCY_INFO = {} +try: + from pathlib import Path + conan_install_info = Path(__file__).parent.joinpath("conan_install_info.json") + if conan_install_info.exists(): + import json + with open(conan_install_info, "r") as f: + DEPENDENCY_INFO = json.loads(f.read()) +except: + pass From 7f27058a6b80bd8e72aa3099843ec1da311207ab Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 17:37:37 +0200 Subject: [PATCH 2/4] Output the Conan Info to the logs Contributes to CURA-9365 --- cura/CuraApplication.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index aac1338444..5ec1515a5f 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -820,6 +820,10 @@ class CuraApplication(QtApplication): def run(self): super().run() + if len(ApplicationMetadata.DEPENDENCY_INFO) > 0: + Logger.debug("Using Conan managed dependencies: " + ", ".join( + [dep["recipe"]["id"] for dep in ApplicationMetadata.DEPENDENCY_INFO["installed"] if dep["recipe"]["version"] != "latest"])) + Logger.log("i", "Initializing machine error checker") self._machine_error_checker = MachineErrorChecker(self) self._machine_error_checker.initialize() From 1e4fe93d64dda0acfd408246bbf8128490fe4f41 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 17:41:59 +0200 Subject: [PATCH 3/4] Output to log if no conan_install_info.json was found Contributes to CURA-9365 --- cura/CuraApplication.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5ec1515a5f..eeaead4f71 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -823,6 +823,8 @@ class CuraApplication(QtApplication): if len(ApplicationMetadata.DEPENDENCY_INFO) > 0: Logger.debug("Using Conan managed dependencies: " + ", ".join( [dep["recipe"]["id"] for dep in ApplicationMetadata.DEPENDENCY_INFO["installed"] if dep["recipe"]["version"] != "latest"])) + else: + Logger.warning("Could not find conan_install_info.json") Logger.log("i", "Initializing machine error checker") self._machine_error_checker = MachineErrorChecker(self) From e62e1e740141febc030810eef7ed3f1055f6564c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 15 Jul 2022 17:42:26 +0200 Subject: [PATCH 4/4] Move one directory up Contributes to CURA-9365 --- cura/ApplicationMetadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 007b4e2813..60d9201d8e 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -64,7 +64,7 @@ except ImportError: DEPENDENCY_INFO = {} try: from pathlib import Path - conan_install_info = Path(__file__).parent.joinpath("conan_install_info.json") + conan_install_info = Path(__file__).parent.parent.joinpath("conan_install_info.json") if conan_install_info.exists(): import json with open(conan_install_info, "r") as f: