3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Added logic for dismissing packages from the Incompatible list

Browse source 
CURA-7090
This commit is contained in:
Dimitriovski 2020-01-11 01:11:49 +01:00
parent c86cc3ae5a
commit 071326b890
No known key found for this signature in database
GPG key ID: 4E62757E2B0D304D
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/Toolbox/src/SubscribedPackagesModel.py
View file

@ -55,7 +55,6 @@ class SubscribedPackagesModel(ListModel):
package.update({"icon_url": ""}) package.update({"icon_url": ""})
self._items.append(package) self._items.append(package)
print("All items:: %s" % self._items)
self.setItems(self._items) self.setItems(self._items)
@ -73,11 +72,14 @@ class SubscribedPackagesModel(ListModel):
has_incompatible_items = True has_incompatible_items = True
return has_incompatible_items return has_incompatible_items
@pyqtSlot(str)
def setDismiss(self, package_id) -> None: def setDismiss(self, package_id) -> None:
package_id_in_list_of_items = self.find(key="package_id", value=package_id) package_id_in_list_of_items = self.find(key="package_id", value=package_id)
if package_id_in_list_of_items != -1: if package_id_in_list_of_items != -1:
self.setProperty(package_id_in_list_of_items, property="is_dismissed", value=True) self.setProperty(package_id_in_list_of_items, property="is_dismissed", value=True)
Logger.debug("Package {} has been dismissed".format(package_id)) Logger.debug("Package {} has been dismissed".format(package_id))
# Now store this package_id as DISMISSED somewhere in local files def addDismissed(self, list_of_dismissed) -> None:
for package in list_of_dismissed:
item = self.find(key="package_id", value=package)
if item != -1:
self.setProperty(item, property="is_dismissed", value=True)

11
plugins/Toolbox/src/Toolbox.py
View file

@ -558,8 +558,8 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str) @pyqtSlot(str)
def dismissIncompatiblePackage(self, package_id): def dismissIncompatiblePackage(self, package_id):
print("---in toolbox: %s" % package_id)
self._models["subscribed_packages"].setDismiss(package_id) self._models["subscribed_packages"].setDismiss(package_id)
self._package_manager.setAsDismissed(package_id)
# Make API Calls # Make API Calls
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -668,12 +668,17 @@ class Toolbox(QObject, Extension):
def _checkCompatibilities(self, json_data) -> None: def _checkCompatibilities(self, json_data) -> None:
user_subscribed_packages = [plugin["package_id"] for plugin in json_data] user_subscribed_packages = [plugin["package_id"] for plugin in json_data]
user_installed_packages = self._package_manager.getUserInstalledPackages() user_installed_packages = self._package_manager.getUserInstalledPackages()
user_dismissed_packages = list(self._package_manager.getDismissedPackages())
user_installed_packages += user_dismissed_packages
# We check if there are packages installed in Cloud Marketplace but not in Cura marketplace (discrepancy) # We check if there are packages installed in Cloud Marketplace but not in Cura marketplace (discrepancy)
package_discrepancy = list(set(user_subscribed_packages).difference(user_installed_packages)) package_discrepancy = list(set(user_subscribed_packages).difference(user_installed_packages))
if package_discrepancy: if package_discrepancy:
self._models["subscribed_packages"].addValue(package_discrepancy) self._models["subscribed_packages"].addValue(package_discrepancy)
self._models["subscribed_packages"].update() self._models["subscribed_packages"].update()
self._models["subscribed_packages"].addDismissed(user_dismissed_packages)
Logger.log("d", "Discrepancy found between Cloud subscribed packages and Cura installed packages") Logger.log("d", "Discrepancy found between Cloud subscribed packages and Cura installed packages")
sync_message = Message(i18n_catalog.i18nc( sync_message = Message(i18n_catalog.i18nc(
"@info:generic", "@info:generic",
@ -802,11 +807,11 @@ class Toolbox(QObject, Extension):
return cast(SubscribedPackagesModel, self._models["subscribed_packages"]) return cast(SubscribedPackagesModel, self._models["subscribed_packages"])
@pyqtProperty(bool, constant=True) @pyqtProperty(bool, constant=True)
def has_compatible_packages(self) -> str: def has_compatible_packages(self) -> bool:
return self._models["subscribed_packages"].hasCompatiblePackages() return self._models["subscribed_packages"].hasCompatiblePackages()
@pyqtProperty(bool, constant=True) @pyqtProperty(bool, constant=True)
def has_incompatible_packages(self) -> str: def has_incompatible_packages(self) -> bool:
return self._models["subscribed_packages"].hasIncompatiblePackages() return self._models["subscribed_packages"].hasIncompatiblePackages()
@pyqtProperty(QObject, constant = True) @pyqtProperty(QObject, constant = True)