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

Also hack the way to get the generic materials, since the tag-filtered

Browse source 
calls to the api don't work yet.

Contributes to CURA-5670.
This commit is contained in:
Diego Prado Gesto 2018-09-10 13:27:13 +02:00 • committed by Jaime van Kessel
parent 301605c30c
commit e3681ddd9f
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,10 +231,12 @@ class Toolbox(QObject, Extension):
# Make remote requests: # Make remote requests:
self._makeRequestByType("packages") self._makeRequestByType("packages")
self._makeRequestByType("authors") self._makeRequestByType("authors")
self._makeRequestByType("plugins_showcase") # TODO: Uncomment in the future when the tag-filtered api calls work in the cloud server
self._makeRequestByType("materials_showcase") # self._makeRequestByType("plugins_showcase")
self._makeRequestByType("materials_available") # self._makeRequestByType("plugins_available")
self._makeRequestByType("materials_generic") # self._makeRequestByType("materials_showcase")
# self._makeRequestByType("materials_available")
# self._makeRequestByType("materials_generic")
# Gather installed packages: # Gather installed packages:
self._updateInstalledModels() self._updateInstalledModels()
@ -614,6 +616,7 @@ class Toolbox(QObject, Extension):
do_not_handle = [ do_not_handle = [
"materials_available", "materials_available",
"materials_showcase", "materials_showcase",
"materials_generic",
"plugins_available", "plugins_available",
"plugins_showcase", "plugins_showcase",
] ]
@ -826,15 +829,20 @@ class Toolbox(QObject, Extension):
if author["author_id"] in processed_authors: if author["author_id"] in processed_authors:
continue continue
if "showcase" in item["tags"]: # Generic materials to be in the same section
self._metadata["materials_showcase"].append(author) if "generic" in item["tags"]:
self._metadata["materials_generic"].append(item)
else: else:
self._metadata["materials_available"].append(author) if "showcase" in item["tags"]:
self._metadata["materials_showcase"].append(author)
else:
self._metadata["materials_available"].append(author)
processed_authors.append(author["author_id"]) processed_authors.append(author["author_id"])
self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"]) self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"])
self._models["materials_available"].setMetadata(self._metadata["materials_available"]) self._models["materials_available"].setMetadata(self._metadata["materials_available"])
self._models["materials_generic"].setMetadata(self._metadata["materials_generic"])
def buildPluginsModels(self) -> None: def buildPluginsModels(self) -> None:
self._metadata["plugins_showcase"] = [] self._metadata["plugins_showcase"] = []