Skip to content

Stop attempting to display the Macro wiki page #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chennes merged 1 commit into from
Aug 14, 2025
Merged

Stop attempting to display the Macro wiki page #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AddonManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ def mark_repo_update_available(self, repo: Addon, available: bool) -> None:
else:
repo.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
self.item_model.reload_item(repo)
self.composite_view.package_details_controller.show_repo(repo)
self.composite_view.package_details_controller.show_addon(repo)

def prep_for_install(self, installing_addon: Addon):
"""To prepare for installing an addon, we need to see if this is the current active branch:
Expand Down Expand Up @@ -712,7 +712,7 @@ def on_package_status_changed(self, repo: Addon) -> None:
if repo.status() == Addon.Status.PENDING_RESTART:
self.restart_required = True
self.item_model.reload_item(repo)
self.composite_view.package_details_controller.show_repo(repo)
self.composite_view.package_details_controller.show_addon(repo)
if repo in self.packages_with_updates:
self.packages_with_updates.remove(repo)
self.enable_updates(len(self.packages_with_updates))
Expand Down
10 changes: 9 additions & 1 deletion Widgets/addonmanager_widget_addon_buttons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ def set_can_check_for_updates(self, can_check_for_updates: bool):
self.update.setVisible(can_check_for_updates)

def set_installation_status(
self, installed: bool, available_branches: List[str], disabled: bool
self,
installed: bool,
available_branches: List[str],
disabled: bool,
can_be_disabled: bool = True,
):
"""Set up the buttons for a given installation status.
:param installed: Whether the addon is currently installed or not.
Expand Down Expand Up @@ -100,8 +104,12 @@ def set_installation_status(
self.actions.append(new_action)
self.branch_menu.addAction(new_action)

if can_be_disabled:
self.enable.setVisible(installed and disabled)
self.disable.setVisible(installed and not disabled)
else:
self.enable.setVisible(False)
self.disable.setVisible(False)
self.retranslateUi(None)

def action_activated(self, _):
Expand Down
78 changes: 44 additions & 34 deletions addonmanager_package_details_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@
"""Provides the PackageDetails widget."""

import os
from typing import Optional

from PySideWrapper import QtCore, QtWidgets

import addonmanager_freecad_interface as fci

from addonmanager_metadata import (
Version,
get_first_supported_freecad_version,
get_branch_from_metadata,
get_repo_url_from_metadata,
)
Expand Down Expand Up @@ -79,69 +76,59 @@ def __init__(self, widget=None):
self.ui.button_bar.disable.clicked.connect(self.disable_clicked)
self.ui.button_bar.install_branch.connect(self.install_branch)

def show_repo(self, addon: Addon) -> None:
def show_addon(self, addon: Addon) -> None:
"""The main entry point for this class shows the package details and related buttons
for the provided repo."""
self.addon = addon
self.readme_controller.set_addon(addon)
self.original_disabled_state = self.addon.is_disabled()
if addon is not None:
self.ui.button_bar.show()
branches = []
if addon.status() == Addon.Status.NOT_INSTALLED:
branches.append(addon.branch_display_name)
if addon.sub_addons:
branches.extend(addon.sub_addons.keys())
self.ui.button_bar.set_installation_status(
installed=addon.status() != Addon.Status.NOT_INSTALLED,
available_branches=branches,
disabled=addon.is_disabled(),
)
self.ui.button_bar.set_can_run(addon.contains_macro())
self.ui.button_bar.set_can_check_for_updates(True if addon.cache_directory else False)
if addon.name == "AddonManager":
self.ui.button_bar.setup_for_addon_manager() # Must happen AFTER other config steps
if addon.repo_type == Addon.Kind.MACRO:
self.set_up_macro_display()
else:
self.set_up_non_macro_display()
self.set_up_updater()
else:
self.ui.button_bar.hide()

def set_up_updater(self):
if self.worker is not None:
if not self.worker.isFinished():
self.worker.requestInterruption()
self.worker.wait()

installed = self.addon.status() != Addon.Status.NOT_INSTALLED
self.ui.set_installed(installed)
if addon.metadata is not None:
self.ui.set_url(get_repo_url_from_metadata(addon.metadata))
if self.addon.metadata is not None:
self.ui.set_url(get_repo_url_from_metadata(self.addon.metadata))
else:
self.ui.set_url(None) # to reset it and hide it
update_info = UpdateInformation()
if installed:
update_info.unchecked = self.addon.status() == Addon.Status.UNCHECKED
update_info.update_available = self.addon.status() == Addon.Status.UPDATE_AVAILABLE
update_info.check_in_progress = False # TODO: Implement the "check in progress" status
if addon.metadata:
update_info.branch = get_branch_from_metadata(addon.metadata)
update_info.version = str(addon.metadata.version)
elif addon.macro:
update_info.version = str(addon.macro.version)
if self.addon.metadata:
update_info.branch = get_branch_from_metadata(self.addon.metadata)
update_info.version = str(self.addon.metadata.version)
elif self.addon.macro:
update_info.version = str(self.addon.macro.version)
self.ui.set_update_available(update_info)
self.ui.set_location(
self.addon.macro_directory
if addon.repo_type == Addon.Kind.MACRO
if self.addon.repo_type == Addon.Kind.MACRO
else os.path.join(self.addon.mod_directory, self.addon.name)
)
self.ui.set_disabled(self.addon.is_disabled())
self.ui.allow_running(addon.repo_type == Addon.Kind.MACRO)
self.ui.allow_disabling(addon.repo_type != Addon.Kind.MACRO)

if addon.status() == Addon.Status.UNCHECKED:
if self.addon.status() == Addon.Status.UNCHECKED:
if not self.update_check_thread:
self.update_check_thread = QtCore.QThread()
self.update_check_thread.setObjectName(
"PackageDetailsController update check thread"
)
self.check_for_update_worker = CheckSingleUpdateWorker(addon)
self.check_for_update_worker = CheckSingleUpdateWorker(self.addon)
self.check_for_update_worker.moveToThread(self.update_check_thread)
self.update_check_thread.finished.connect(self.check_for_update_worker.deleteLater)
self.ui.button_bar.check_for_update.clicked.connect(
Expand All @@ -155,6 +142,32 @@ def show_repo(self, addon: Addon) -> None:
flags = WarningFlags()
self.ui.set_warning_flags(flags)

def set_up_non_macro_display(self):
branches = []
if self.addon.status() == Addon.Status.NOT_INSTALLED:
branches.append(self.addon.branch_display_name)
if self.addon.sub_addons:
branches.extend(self.addon.sub_addons.keys())
self.ui.button_bar.set_installation_status(
installed=self.addon.status() != Addon.Status.NOT_INSTALLED,
available_branches=branches,
disabled=self.addon.is_disabled(),
)
self.ui.button_bar.set_can_run(False)
self.ui.button_bar.set_can_check_for_updates(True if self.addon.cache_directory else False)
if self.addon.name == "AddonManager":
self.ui.button_bar.setup_for_addon_manager() # Must happen AFTER other config steps

def set_up_macro_display(self):
self.ui.button_bar.set_installation_status(
installed=self.addon.status() != Addon.Status.NOT_INSTALLED,
available_branches=[],
disabled=self.addon.is_disabled(),
can_be_disabled=False,
)
self.ui.button_bar.set_can_run(True)
self.ui.button_bar.set_can_check_for_updates(False)

def enable_clicked(self) -> None:
"""Called by the Enable button, enables this Addon and updates GUI to reflect
that status."""
Expand Down Expand Up @@ -229,7 +242,4 @@ def branch_changed(self, old_branch: str, name: str) -> None:

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)
self.show_addon(self.addon)
Loading