Add function to derive repository name from Git URL and refactor ExtensionsWindow for improved extension management. Update UI logic for custom section handling and refresh extension list after installation.

jmcouffin · jmcouffin · commit ec2eb76471ba · 2026-02-15T16:53:27.000+01:00
diff --git a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Extensions.smartbutton/script.py b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Extensions.smartbutton/script.py
@@ -19,6 +19,26 @@
 logger = script.get_logger()
 
 
+def _repo_name_from_git_url(git_url):
+    """Derive repo/folder name from a Git URL (e.g. .../owner/repo.git -> repo)."""
+    if not git_url:
+        return ""
+    # Strip .git suffix
+    url = git_url.rstrip("/")
+    if url.lower().endswith(".git"):
+        url = url[:-4]
+    # Last path segment: after last / or, for git@host:path, after last /
+    if "/" in url:
+        url = url.rsplit("/", 1)[-1]
+    elif url.startswith("git@"):
+        # git@host:owner/repo -> owner/repo -> repo
+        if ":" in url:
+            url = url.split(":", 1)[1]
+        if "/" in url:
+            url = url.rsplit("/", 1)[-1]
+    return url.strip() or ""
+
+
 class ExtensionPackageListItem:
     """Extension object that is used in Extensions list ui.
 
@@ -88,32 +108,18 @@ def searchable_values(self):
         )
 
 
-class InstallPackageMenuItem(framework.Controls.MenuItem):
-    """Context menu item for package installation destinations
-
-    Instances of this class will be set to the possible directory paths
-    that are appropriate to install extensions in. This includes pyRevit
-    default extension folder and all other extension folders set by the
-    user. When installing an extension, user can select the destination
-    from the destinations menu which contains instances of this class.
-
-    Attributes:
-        InstallPackageMenuItem.install_path (str): Destination address
-
-    """
-
-    install_path = ""
-
-
 class ExtensionsWindow(forms.WPFWindow):
     """Extension window managing installation and removal of extensions"""
 
     def __init__(self, xaml_file_name):
         forms.WPFWindow.__init__(self, xaml_file_name)
-        self._setup_ext_dirs_ui(user_config.get_thirdparty_ext_root_dirs())
         self._setup_ext_pkg_ui(extpkgs.get_ext_packages())
         default_path = user_config.get_thirdparty_ext_root_dirs(include_default=True)[0]
         self.custom_ext_install_path_tb.Text = default_path
+        if self.selected_pkg:
+            self._update_add_custom_section_for_selection(self.selected_pkg)
+        else:
+            self._update_add_custom_section_for_new()
 
     @property
     def selected_pkg(self):
@@ -138,24 +144,6 @@ def selected_pkgs(self):
         """
         return self.extpkgs_lb.SelectedItems
 
-    def _setup_ext_dirs_ui(self, ext_dirs_list):
-        """Creates the installation destination context menu. Creates a menu
-        item for each directory address provided in ext_dirs_list
-
-        Args:
-            ext_dirs_list (list): List of destination directories
-
-        """
-
-        for ext_dir in ext_dirs_list:
-            ext_dir_install_menu_item = InstallPackageMenuItem()
-            ext_dir_install_menu_item.install_path = ext_dir
-            ext_dir_install_menu_item.Header = self.get_locale_string(
-                "Extension.InstallPath"
-            ).format(ext_dir)
-            ext_dir_install_menu_item.Click += self.install_ext_pkg
-            self.ext_install_b.ContextMenu.AddChild(ext_dir_install_menu_item)
-
     def _setup_ext_pkg_ui(self, ext_pkgs_list):
         """Creates a list of initialized ExtensionPackageListItem objects,
         one for each extension package object in ext_pkgs_list
@@ -172,7 +160,13 @@ def _setup_ext_pkg_ui(self, ext_pkgs_list):
         self.extpkgs_lb.ItemsSource = sorted(
             self._exts_list, key=lambda x: x.Builtin, reverse=True
         )
-        self.extpkgs_lb.SelectedIndex = 0
+        self.extpkgs_lb.SelectedIndex = -1
+
+    def _refresh_extension_list(self):
+        """Reload extension packages and refresh the grid (e.g. after installing)."""
+        ext_pkgs_list = extpkgs.get_ext_packages()
+        self._setup_ext_pkg_ui(ext_pkgs_list)
+        self._update_add_custom_section_for_new()
 
     def _update_ext_info_panel(self, ext_pkg_item):
         """Updated the extension information panel based on the info
@@ -217,14 +211,15 @@ def _update_ext_info_panel(self, ext_pkg_item):
         else:
             self.ext_repolink_t.Text = ""
 
-        # Update Installed folder info
+        # Update install path (own line, like Developed by)
         if ext_pkg_item.ext_pkg.is_installed:
-            self.show_element(self.ext_installed_l)
-            self.ext_installed_l.Content = self.get_locale_string(
-                "Extension.InstalledPath"
-            ).format(ext_pkg_item.ext_pkg.is_installed)
+            self.show_element(self.ext_installpath_tb)
+            self.ext_installpath_tb.Text = (
+                self.get_locale_string("ExtensionInfo.InstallPathLink")
+                + ext_pkg_item.ext_pkg.is_installed
+            )
         else:
-            self.hide_element(self.ext_installed_l)
+            self.hide_element(self.ext_installpath_tb)
 
         # Update dependencies
         if ext_pkg_item.ext_pkg.dependencies:
@@ -267,9 +262,6 @@ def _update_ext_action_buttons(self, ext_pkg_items):
         if len(ext_pkg_items) == 1:
             ext_pkg_item = ext_pkg_items[0]
             if ext_pkg_item.ext_pkg.is_installed:
-                # Action Button: Install
-                self.hide_element(self.ext_install_b)
-
                 # Action Button: Remove
                 if ext_pkg_item.ext_pkg.builtin:
                     self.hide_element(self.ext_remove_b)
@@ -279,10 +271,8 @@ def _update_ext_action_buttons(self, ext_pkg_items):
                 # Action Button: Toggle (Enable / Disable)
                 self._update_toggle_button(enable=ext_pkg_item.ext_pkg.config.disabled)
             else:
-                self.show_element(self.ext_install_b)
                 self.hide_element(self.ext_toggle_b, self.ext_remove_b)
         elif len(ext_pkg_items) > 1:
-            self.hide_element(self.ext_install_b)
             self.hide_element(self.ext_remove_b)
             # hide the button if includes any cli extensions
             if any([not x.ext_pkg.is_installed for x in ext_pkg_items]):
@@ -330,55 +320,123 @@ def update_ext_info(self, sender, args):
             self.show_element(self.ext_infopanel)
             self._update_ext_info_panel(self.selected_pkg)
             self._update_ext_action_buttons([self.selected_pkg])
+            self._update_add_custom_section_for_selection(self.selected_pkg)
         elif self.selected_pkgs:
             self.hide_element(self.ext_infostack)
             self._update_ext_action_buttons(self.selected_pkgs)
+            self._update_add_custom_section_for_new()
         else:
-            self.hide_element(self.ext_infopanel)
-
-    def handle_install_button_popup(self, sender, args):
-        """Callback for Install package destination context menu
-
-        This callback method will popup a menu with a list of install
-        destinations, when the install button is clicked.
-        """
-        sender.ContextMenu.IsEnabled = True
-        sender.ContextMenu.PlacementTarget = sender
-        sender.ContextMenu.Placement = (
-            framework.Controls.Primitives.PlacementMode.Bottom
-        )
-        sender.ContextMenu.IsOpen = True
-
-    def install_ext_pkg(self, sender, args):
-        """Installs the selected extension, then reloads pyRevit"""
+            self.show_element(self.ext_infopanel)
+            self.hide_element(self.ext_infostack)
+            self.hide_element(self.ext_toggle_b, self.ext_remove_b)
+            self._update_add_custom_section_for_new()
+
+    def _update_add_custom_section_for_selection(self, ext_pkg_item):
+        """Populate Add Custom section from selected extension; disable Pick, show Install only if not installed."""
+        self.custom_git_url_tb.Text = ext_pkg_item.GitURL or ""
+        if getattr(self, "custom_ext_name_tb", None):
+            self.custom_ext_name_tb.Text = ext_pkg_item.Name or ""
+        self.custom_git_url_tb.IsReadOnly = True
+        if getattr(self, "custom_ext_name_tb", None):
+            self.custom_ext_name_tb.IsReadOnly = True
+        self.path_custom_ext_b.IsEnabled = False
+        if ext_pkg_item.ext_pkg.is_installed:
+            self.custom_ext_install_path_tb.Text = ext_pkg_item.ext_pkg.is_installed
+        else:
+            default_path = user_config.get_thirdparty_ext_root_dirs(include_default=True)[0]
+            self.custom_ext_install_path_tb.Text = default_path
+        if ext_pkg_item.ext_pkg.is_installed:
+            self.hide_element(self.install_custom_ext_b)
+        else:
+            self.show_element(self.install_custom_ext_b)
+            self.install_custom_ext_b.Content = self.get_locale_string("Buttons.InstallExtension")
+
+    def _update_add_custom_section_for_new(self):
+        """Reset Add Custom section for adding a new extension; enable Pick, show Add and install."""
+        self.custom_git_url_tb.Text = ""
+        if getattr(self, "custom_ext_name_tb", None):
+            self.custom_ext_name_tb.Text = ""
+        self.custom_git_url_tb.IsReadOnly = False
+        if getattr(self, "custom_ext_name_tb", None):
+            self.custom_ext_name_tb.IsReadOnly = False
+        self.path_custom_ext_b.IsEnabled = True
+        default_path = user_config.get_thirdparty_ext_root_dirs(include_default=True)[0]
+        self.custom_ext_install_path_tb.Text = default_path
+        self.show_element(self.install_custom_ext_b)
+        self._update_ext_info_from_git_fields()
+
+    def _update_ext_info_from_git_fields(self):
+        """Update extension details panel from Git information fields when in add-new mode."""
+        if self.custom_git_url_tb.IsReadOnly:
+            return
+        name = ""
+        if getattr(self, "custom_ext_name_tb", None):
+            name = self.custom_ext_name_tb.Text.strip()
+        url = self.custom_git_url_tb.Text.strip()
+        path = self.custom_ext_install_path_tb.Text.strip()
+        if name or url or path:
+            self.show_element(self.ext_infostack)
+            display_name = name or (_repo_name_from_git_url(url) if url else "") or "(enter Git URL)"
+            self.ext_name_l.Content = display_name
+            self.ext_desc_l.Text = (url + "  ") if url else ""
+            if url and (url.startswith("http://") or url.startswith("https://")):
+                self.ext_gitlink_t.Text = "(" + url + ")"
+                self.ext_gitlink_hl.NavigateUri = framework.Uri(url)
+            else:
+                self.ext_gitlink_t.Text = ""
+            self.ext_author_t.Text = ""
+            self.ext_author_nolink_t.Text = ""
+            self.ext_repolink_t.Text = ""
+            if path:
+                self.show_element(self.ext_installpath_tb)
+                self.ext_installpath_tb.Text = (
+                    self.get_locale_string("ExtensionInfo.InstallPathLink") + path
+                )
+            else:
+                self.hide_element(self.ext_installpath_tb)
+            self.hide_element(self.ext_dependencies_l)
+        else:
+            self.hide_element(self.ext_infostack)
 
-        try:
-            extpkgs.install(self.selected_pkg.ext_pkg, sender.install_path)
-            self.Close()
-            call_reload()
-        except Exception as pkg_install_err:
-            logger.error("Error installing package." " | {}".format(pkg_install_err))
-            self.Close()
+    def git_info_text_changed(self, sender, args):
+        """When Git information fields change, update the details panel if in add-new mode."""
+        if self.custom_git_url_tb.IsReadOnly:
+            return
+        self._update_ext_info_from_git_fields()
+        self.install_custom_ext_b.Content = self.get_locale_string("AddCustomExtension.AddAndInstall")
 
     def custom_extension_path(self, sender, args):
         "Picks a folder to install to"
         custom_path = forms.pick_folder(owner=self)
         if custom_path:
             custom_path = os.path.normpath(custom_path)
         self.custom_ext_install_path_tb.Text = custom_path if custom_path else ""
+        self._update_ext_info_from_git_fields()
 
     def install_custom_extension(self, sender, args):
-        """Installs a custom extension from a Git URL
-
-        This mimics the behavior of:
-        pyrevit extend ui ExtName https://github.com/user/repo.git
-            --dest="path" --token=token
-        """
+        """Installs a custom extension from a Git URL or the selected catalog extension."""
 
         try:
-            # Get values from UI
+            # Catalog install: selected extension from list, not yet installed
+            if self.selected_pkg and not self.selected_pkg.ext_pkg.is_installed:
+                dest_path = self.custom_ext_install_path_tb.Text
+                if not dest_path:
+                    ext_dirs = user_config.get_thirdparty_ext_root_dirs(include_default=True)
+                    dest_path = ext_dirs[0]
+                token = self.custom_token_pb.Password.strip()
+                if token:
+                    self.selected_pkg.ext_pkg.config.private_repo = True
+                    self.selected_pkg.ext_pkg.config.token = token
+                extpkgs.install(self.selected_pkg.ext_pkg, dest_path)
+                self._refresh_extension_list()
+                self.Close()
+                call_reload()
+                return
+
+            # Add new extension from Git URL
             git_url = self.custom_git_url_tb.Text.strip()
-            ext_name = self.custom_ext_name_tb.Text.strip()
+            _name_tb = getattr(self, "custom_ext_name_tb", None)
+            ext_name = (_name_tb.Text.strip() if _name_tb else "") or _repo_name_from_git_url(git_url)
             token = self.custom_token_pb.Password.strip()
 
             # Validation
@@ -387,7 +445,7 @@ def install_custom_extension(self, sender, args):
                 return
 
             if not ext_name:
-                forms.alert("Please enter an extension name.", exitscript=False)
+                forms.alert("Could not derive extension name from URL. Please enter a Git URL with a repo path (e.g. .../owner/repo.git).", exitscript=False)
                 return
 
             # Check if URL is valid git URL
@@ -402,24 +460,15 @@ def install_custom_extension(self, sender, args):
                 )
                 return
 
-            # If token is provided, inject it into the URL
-            if token:
-                # For HTTPS URLs, inject token
-                if git_url.startswith("https://") or git_url.startswith("http://"):
-                    # Parse URL to inject token
-                    # Format: https://oauth2:TOKEN@github.com/user/repo.git
-                    url_parts = git_url.split("://", 1)
-                    if len(url_parts) == 2:
-                        protocol = url_parts[0]
-                        rest = url_parts[1]
-
-                        # Remove any existing credentials
-                        if "@" in rest:
-                            # Already has credentials, replace them
-                            rest = rest.split("@", 1)[1]
-
-                        # Inject token (use 'oauth2' as username for GitLab compatibility)
-                        git_url = "{0}://oauth2:{1}@{2}".format(protocol, token, rest)
+            # Use a clean URL; token is passed via config and used by git_clone
+            # (embedding credentials in the URL can cause "too many redirects or
+            # authentication replays" with libgit2)
+            if git_url.startswith("https://") or git_url.startswith("http://"):
+                if "@" in git_url.split("://", 1)[1].split("/")[0]:
+                    # Strip existing credentials from URL
+                    protocol, rest = git_url.split("://", 1)
+                    rest = rest.split("@", 1)[-1]
+                    git_url = protocol + "://" + rest
 
             # Get default extension directory
             dest_path = self.custom_ext_install_path_tb.Text
@@ -451,6 +500,7 @@ def install_custom_extension(self, sender, args):
                 temp_pkg.config.token = token
 
             extpkgs.install(temp_pkg, dest_path)
+            self._refresh_extension_list()
 
             forms.alert(
                 'Extension "{}" installed successfully! \n'
@@ -489,6 +539,10 @@ def remove_ext_pkg(self, sender, args):
             call_reload()
         except Exception as pkg_remove_err:
             logger.error("Error removing package. | {}".format(pkg_remove_err))
+            forms.alert(
+                "Error removing extension:\n{}".format(str(pkg_remove_err)),
+                exitscript=False,
+            )
 
 
 def open_ext_dirs_in_explorer(ext_dirs_list):
