From 87fb94342f8d8d9ace705afe87b811c678dcb075 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 10 Mar 2024 21:19:21 -0500 Subject: [PATCH] Addon Manager: Fix README fetch for macros When no macro metadata is downloaded, the macro has no URL yet. --- .../addonmanager_package_details_controller.py | 3 +++ src/Mod/AddonManager/addonmanager_readme_controller.py | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/Mod/AddonManager/addonmanager_package_details_controller.py b/src/Mod/AddonManager/addonmanager_package_details_controller.py index 9c934039fb..09a6c7a76f 100644 --- a/src/Mod/AddonManager/addonmanager_package_details_controller.py +++ b/src/Mod/AddonManager/addonmanager_package_details_controller.py @@ -267,3 +267,6 @@ class PackageDetailsController(QtCore.QObject): def display_repo_status(self, addon): self.update_status.emit(self.addon) self.show_repo(self.addon) + + def macro_readme_updated(self): + self.show_repo(self.addon) diff --git a/src/Mod/AddonManager/addonmanager_readme_controller.py b/src/Mod/AddonManager/addonmanager_readme_controller.py index 1760a7ff6f..44620a18f2 100644 --- a/src/Mod/AddonManager/addonmanager_readme_controller.py +++ b/src/Mod/AddonManager/addonmanager_readme_controller.py @@ -74,6 +74,14 @@ class ReadmeController(QtCore.QObject): self.url = self.addon.macro.wiki if not self.url: self.url = self.addon.macro.url + if not self.url: + self.widget.setText( + translate( + "AddonsInstaller", + "Loading info for {} from the FreeCAD Macro Recipes wiki...", + ).format(self.addon.display_name, self.url) + ) + return else: self.url = utils.get_readme_url(repo) self.widget.setUrl(self.url)