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

Some refactoring done after code review

Browse source 
CURA-6979
This commit is contained in:
Dimitriovski 2019-12-16 15:39:21 +01:00
parent ebc0813603
commit 3c2da64c94
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class Toolbox(QObject, Extension):
"authors": [], "authors": [],
"packages": [], "packages": [],
"updates": [], "updates": [],
"installed_packages": [], "subscribed_packages": [],
} # type: Dict[str, List[Any]] } # type: Dict[str, List[Any]]
# Models: # Models:
@ -70,7 +70,7 @@ class Toolbox(QObject, Extension):
"authors": AuthorsModel(self), "authors": AuthorsModel(self),
"packages": PackagesModel(self), "packages": PackagesModel(self),
"updates": PackagesModel(self), "updates": PackagesModel(self),
"installed_packages": PackagesModel(self), "subscribed_packages": PackagesModel(self),
} # type: Dict[str, Union[AuthorsModel, PackagesModel]] } # type: Dict[str, Union[AuthorsModel, PackagesModel]]
self._plugins_showcase_model = PackagesModel(self) self._plugins_showcase_model = PackagesModel(self)
@ -217,7 +217,7 @@ class Toolbox(QObject, Extension):
"packages": QUrl("{base_url}/packages".format(base_url = self._api_url)), "packages": QUrl("{base_url}/packages".format(base_url = self._api_url)),
"updates": QUrl("{base_url}/packages/package-updates?installed_packages={query}".format( "updates": QUrl("{base_url}/packages/package-updates?installed_packages={query}".format(
base_url = self._api_url, query = installed_packages_query)), base_url = self._api_url, query = installed_packages_query)),
"installed_packages": QUrl("{base_url}/user/packages".format(base_url=self._api_url_user_packages)) "subscribed_packages": QUrl("{base_url}/user/packages".format(base_url=self._api_url_user_packages))
} }
self._application.getCuraAPI().account.loginStateChanged.connect(self._restart) self._application.getCuraAPI().account.loginStateChanged.connect(self._restart)
@ -250,9 +250,9 @@ class Toolbox(QObject, Extension):
self._updateInstalledModels() self._updateInstalledModels()
def _fetchUserInstalledPlugins(self): def _fetchUserInstalledPlugins(self):
self._prepareNetworkManager()
if self._application.getCuraAPI().account.isLoggedIn: if self._application.getCuraAPI().account.isLoggedIn:
self._makeRequestByType("installed_packages") self._prepareNetworkManager()
self._makeRequestByType("subscribed_packages")
# Displays the toolbox # Displays the toolbox
@pyqtSlot() @pyqtSlot()
@ -662,8 +662,8 @@ class Toolbox(QObject, Extension):
Logger.log("e", "Could not find the %s model.", response_type) Logger.log("e", "Could not find the %s model.", response_type)
break break
# Workaround: Do not add Metadata for "installed_packages" check JUST YET # Workaround: Do not add Metadata for "subscribed_packages" check JUST YET
if response_type != "installed_packages": if response_type != "subscribed_packages":
self._server_response_data[response_type] = json_data["data"] self._server_response_data[response_type] = json_data["data"]
self._models[response_type].setMetadata(self._server_response_data[response_type]) self._models[response_type].setMetadata(self._server_response_data[response_type])
@ -679,11 +679,11 @@ class Toolbox(QObject, Extension):
# Tell the package manager that there's a new set of updates available. # Tell the package manager that there's a new set of updates available.
packages = set([pkg["package_id"] for pkg in self._server_response_data[response_type]]) packages = set([pkg["package_id"] for pkg in self._server_response_data[response_type]])
self._package_manager.setPackagesWithUpdate(packages) self._package_manager.setPackagesWithUpdate(packages)
elif response_type == "installed_packages": elif response_type == "subscribed_packages":
user_subscribed = [(plugin['package_id'], plugin['package_version']) for plugin in json_data['data']] user_subscribed = [(plugin['package_id'], plugin['package_version']) for plugin in json_data['data']]
Logger.log("i", "- User is subscribed to {} package(s).".format(len(user_subscribed))) Logger.log("d", "User is subscribed to {} package(s).".format(len(user_subscribed)))
user_installed = self._package_manager.getUserInstalledPackagesOnMarketplace() user_installed = self._package_manager.getUserInstalledPackagesOnMarketplace()
Logger.log("i", "- User has installed locally {} package(s).".format(len(user_installed))) Logger.log("d", "User has installed locally {} package(s).".format(len(user_installed)))
# Check for discrepancies between Cura installed and Cloud subscribed packages # Check for discrepancies between Cura installed and Cloud subscribed packages
# convert them to set() to check if they are equal # convert them to set() to check if they are equal