From 8a198f79112ee6c14887b9128c6ff9633d6a97c7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 17 Dec 2021 16:31:11 +0100 Subject: [PATCH] Simplify sorting CURA-8587 --- plugins/Marketplace/LocalPackageList.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/LocalPackageList.py b/plugins/Marketplace/LocalPackageList.py index 95db67a58f..48d06d7b0b 100644 --- a/plugins/Marketplace/LocalPackageList.py +++ b/plugins/Marketplace/LocalPackageList.py @@ -44,8 +44,8 @@ class LocalPackageList(PackageList): self._package_manager.packageUninstalled.connect(self._removePackageModel) def _sortSectionsOnUpdate(self) -> None: - SECTION_ORDER = dict(zip([i for k, v in self.PACKAGE_CATEGORIES.items() for i in self.PACKAGE_CATEGORIES[k].values()], ["a", "b", "c", "d"])) - self.sort(lambda model: f"{SECTION_ORDER[model.sectionTitle]}_{model._can_update}_{model.displayName}".lower(), key = "package") + section_order = dict(zip([i for k, v in self.PACKAGE_CATEGORIES.items() for i in self.PACKAGE_CATEGORIES[k].values()], ["a", "b", "c", "d"])) + self.sort(lambda model: (section_order[model.sectionTitle], model.canUpdate, model.displayName.lower()), key = "package") def _removePackageModel(self, package_id): package = self.getPackageModel(package_id)