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

Fix more codestyle issues

Browse source 
CURA-6006
This commit is contained in:
Jaime van Kessel 2018-12-05 11:06:14 +01:00
parent 978a01e4c8
commit d9135ac72f
1 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,34 +559,30 @@ class Toolbox(QObject, Extension):
# Check for plugins that were installed with the old plugin browser # Check for plugins that were installed with the old plugin browser
def isOldPlugin(self, plugin_id: str) -> bool: def isOldPlugin(self, plugin_id: str) -> bool:
if plugin_id in self._old_plugin_ids: return plugin_id in self._old_plugin_ids
return True
return False
def getOldPluginPackageMetadata(self, plugin_id: str) -> Optional[Dict[str, Any]]: def getOldPluginPackageMetadata(self, plugin_id: str) -> Optional[Dict[str, Any]]:
return self._old_plugin_metadata.get(plugin_id) return self._old_plugin_metadata.get(plugin_id)
def loadingComplete(self) -> bool: def isLoadingComplete(self) -> bool:
populated = 0 populated = 0
for list in self._metadata.items(): for metadata_list in self._metadata.items():
if len(list) > 0: if metadata_list:
populated += 1 populated += 1
if populated == len(self._metadata.items()): return populated == len(self._metadata.items())
return True
return False
# Make API Calls # Make API Calls
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
def _makeRequestByType(self, type: str) -> None: def _makeRequestByType(self, request_type: str) -> None:
Logger.log("i", "Marketplace: Requesting %s metadata from server.", type) Logger.log("i", "Requesting %s metadata from server.", request_type)
request = QNetworkRequest(self._request_urls[type]) request = QNetworkRequest(self._request_urls[request_type])
request.setRawHeader(*self._request_header) request.setRawHeader(*self._request_header)
if self._network_manager: if self._network_manager:
self._network_manager.get(request) self._network_manager.get(request)
@pyqtSlot(str) @pyqtSlot(str)
def startDownload(self, url: str) -> None: def startDownload(self, url: str) -> None:
Logger.log("i", "Marketplace: Attempting to download & install package from %s.", url) Logger.log("i", "Attempting to download & install package from %s.", url)
url = QUrl(url) url = QUrl(url)
self._download_request = QNetworkRequest(url) self._download_request = QNetworkRequest(url)
if hasattr(QNetworkRequest, "FollowRedirectsAttribute"): if hasattr(QNetworkRequest, "FollowRedirectsAttribute"):
@ -603,7 +599,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot() @pyqtSlot()
def cancelDownload(self) -> None: def cancelDownload(self) -> None:
Logger.log("i", "Marketplace: User cancelled the download of a package.") Logger.log("i", "User cancelled the download of a package.")
self.resetDownload() self.resetDownload()
def resetDownload(self) -> None: def resetDownload(self) -> None:
@ -647,10 +643,10 @@ class Toolbox(QObject, Extension):
] ]
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
for type, url in self._request_urls.items(): for response_type, url in self._request_urls.items():
# HACK: Do nothing because we'll handle these from the "packages" call # HACK: Do nothing because we'll handle these from the "packages" call
if type in do_not_handle: if response_type in do_not_handle:
continue continue
if reply.url() == url: if reply.url() == url:
@ -665,38 +661,35 @@ class Toolbox(QObject, Extension):
return return
# Create model and apply metadata: # Create model and apply metadata:
if not self._models[type]: if not self._models[response_type]:
Logger.log("e", "Could not find the %s model.", type) Logger.log("e", "Could not find the %s model.", response_type)
break break
self._metadata[type] = json_data["data"] self._metadata[response_type] = json_data["data"]
self._models[type].setMetadata(self._metadata[type]) self._models[response_type].setMetadata(self._metadata[response_type])
# Do some auto filtering # Do some auto filtering
# TODO: Make multiple API calls in the future to handle this # TODO: Make multiple API calls in the future to handle this
if type is "packages": if response_type is "packages":
self._models[type].setFilter({"type": "plugin"}) self._models[response_type].setFilter({"type": "plugin"})
self.buildMaterialsModels() self.buildMaterialsModels()
self.buildPluginsModels() self.buildPluginsModels()
if type is "authors": if response_type is "authors":
self._models[type].setFilter({"package_types": "material"}) self._models[response_type].setFilter({"package_types": "material"})
if type is "materials_generic": if response_type is "materials_generic":
self._models[type].setFilter({"tags": "generic"}) self._models[response_type].setFilter({"tags": "generic"})
self.metadataChanged.emit() self.metadataChanged.emit()
if self.loadingComplete() is True: if self.isLoadingComplete():
self.setViewPage("overview") self.setViewPage("overview")
return
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
Logger.log("w", "Marketplace: Received invalid JSON for %s.", type) Logger.log("w", "Received invalid JSON for %s.", response_type)
break break
else: else:
self.setViewPage("errored") self.setViewPage("errored")
self.resetDownload() self.resetDownload()
return
else: else:
# Ignore any operation that is not a get operation # Ignore any operation that is not a get operation
pass pass
@ -717,10 +710,10 @@ class Toolbox(QObject, Extension):
self._onDownloadComplete(file_path) self._onDownloadComplete(file_path)
def _onDownloadComplete(self, file_path: str) -> None: def _onDownloadComplete(self, file_path: str) -> None:
Logger.log("i", "Marketplace: Download complete.") Logger.log("i", "Download complete.")
package_info = self._package_manager.getPackageInfo(file_path) package_info = self._package_manager.getPackageInfo(file_path)
if not package_info: if not package_info:
Logger.log("w", "Marketplace: Package file [%s] was not a valid CuraPackage.", file_path) Logger.log("w", "Package file [%s] was not a valid CuraPackage.", file_path)
return return
license_content = self._package_manager.getPackageLicense(file_path) license_content = self._package_manager.getPackageLicense(file_path)
@ -729,7 +722,6 @@ class Toolbox(QObject, Extension):
return return
self.install(file_path) self.install(file_path)
return
# Getter & Setters for Properties: # Getter & Setters for Properties:
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -847,7 +839,7 @@ class Toolbox(QObject, Extension):
self._metadata["materials_available"] = [] self._metadata["materials_available"] = []
self._metadata["materials_generic"] = [] self._metadata["materials_generic"] = []
processed_authors = [] # type: List[str] processed_authors = [] # type: List[str]
for item in self._metadata["packages"]: for item in self._metadata["packages"]:
if item["package_type"] == "material": if item["package_type"] == "material":