* Fix conan worker install ref call (affects Conan Install Dialog)

* Fix RemoveRef menu item not enabled in LPE
goszpeti · Sep 12, 2023 · cf731b3 · cf731b3
1 parent f85cb94
commit cf731b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/conan_app_launcher/conan_wrapper/conanV2.py b/src/conan_app_launcher/conan_wrapper/conanV2.py
@@ -355,7 +355,8 @@ def search_recipe_all_versions_in_remotes(self, conan_ref: ConanRef) -> List[Con
         self.info_cache.update_remote_package_list(res_list)
         return res_list
 
-    def get_remote_pkgs_from_ref(self, conan_ref: ConanRef, remote: Optional[str], query=None) -> List[ConanPkg]:
+    def get_remote_pkgs_from_ref(self, conan_ref: ConanRef, remote: Optional[str], 
+                                 query=None) -> List[ConanPkg]:
         found_pkgs: List[ConanPkg] = []
         try:
             from conan.api.model import ListPattern
@@ -366,8 +367,8 @@ def get_remote_pkgs_from_ref(self, conan_ref: ConanRef, remote: Optional[str], q
                 for remote_obj in self.get_remotes():
                     if remote_obj.name == remote:
                         break
-            search_results = self._conan.list.select(
-                pattern, remote=remote_obj, package_query=query)
+            search_results = self._conan.list.select(pattern, remote=remote_obj, 
+                                                     package_query=query)
             if search_results:
                 latest_rev = self._conan.list.latest_recipe_revision(
                     conan_ref, remote_obj)

diff --git a/src/conan_app_launcher/conan_wrapper/conan_worker.py b/src/conan_app_launcher/conan_wrapper/conan_worker.py
@@ -103,8 +103,8 @@ def _work_on_conan_install_queue(self):
                         pkg_id, _ = self._conan_api.get_path_or_auto_install(
                             conan_ref, conan_options, update)
                     else:
-                        pkg_id, _ = self._conan_api.install_reference(
-                            conan_ref, conan_profile, conan_settings, conan_options, update)
+                        pkg_id, _ = self._conan_api.install_reference(conan_ref,
+                            conan_settings, conan_options, conan_profile, update)
             except Exception as e:
                 try:
                     self._conan_install_queue.task_done()

diff --git a/src/conan_app_launcher/ui/views/package_explorer/package_explorer.py b/src/conan_app_launcher/ui/views/package_explorer/package_explorer.py
@@ -12,7 +12,7 @@
 from .sel_model import PkgSelectionType
 
 from PySide6.QtCore import Qt, Signal
-from PySide6.QtGui import QKeySequence, QResizeEvent, QAction
+from PySide6.QtGui import QKeySequence, QResizeEvent, QAction, QShowEvent
 from PySide6.QtWidgets import (QWidget, QTabBar, QTreeView, QHBoxLayout, QFrame, 
                                QAbstractItemView, QAbstractScrollArea)
 
@@ -128,7 +128,7 @@ def on_pkg_selection_change(self, conan_ref: str, pkg: ConanPkg, type: PkgSelect
         if ctrl._model:
             self._ui.package_path_label.setText(ctrl._model.rootPath())
 
-    def showEvent(self, a0: "QShowEvent") -> None:
+    def showEvent(self, a0: QShowEvent) -> None:
         self._pkg_sel_ctrl.refresh_pkg_selection_view(force_update=False)  # only update the first time
         return super().showEvent(a0)
 
@@ -191,7 +191,7 @@ def on_selection_context_menu_requested(self, position):
             self.show_build_info_action.setVisible(True)
             self.show_conanfile_action.setVisible(True)
             self.install_ref_action.setVisible(True)
-            self.remove_ref_action.setVisible(False)
+            self.remove_ref_action.setVisible(True)
 
         self.select_cntx_menu.exec(self._ui.package_select_view.mapToGlobal(position))