3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix merge issues

Browse source 
CURA-6983
This commit is contained in:
Nino van Hooff 2020-01-15 16:14:17 +01:00
parent 182bab6467
commit 248a4cbb94
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
View file

@ -44,13 +44,15 @@ class CloudPackageChecker(QObject):
def _handleCompatibilityData(self, json_data) -> None:
user_subscribed_packages = [plugin["package_id"] for plugin in json_data]
user_installed_packages = self._package_manager.getUserInstalledPackages()
# We check if there are packages installed in Cloud Marketplace but not in Cura marketplace (discrepancy)
user_dismissed_packages = self._package_manager.getDismissedPackages()
if user_dismissed_packages:
user_installed_packages += user_dismissed_packages
# We check if there are packages installed in Cloud Marketplace but not in Cura marketplace
package_discrepancy = list(set(user_subscribed_packages).difference(user_installed_packages))
self._model.setMetadata(json_data)
self._model.addValue(package_discrepancy)
self._model.update()
self._model.addDiscrepancies(package_discrepancy)
self._model.initialize()
if package_discrepancy:
self._handlePackageDiscrepancies()