From 68372aff6038064892becda076e6c642a36e92b7 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 20 Dec 2018 10:45:38 +0100
Subject: [PATCH] Use MaterialManager in SendMaterialJob

CURA-6035
---
 .../UM3NetworkPrinting/src/SendMaterialJob.py | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py
index a1ddf37461..7a0da24098 100644
--- a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py
+++ b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py
@@ -2,17 +2,14 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 import json
 import os
-import urllib.parse
 from typing import Dict, TYPE_CHECKING, Set
 
 from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
 
-from UM.Application import Application
 from UM.Job import Job
 from UM.Logger import Logger
-from UM.MimeTypeDatabase import MimeTypeDatabase
-from UM.Resources import Resources
 from cura.CuraApplication import CuraApplication
+
 # Absolute imports don't work in plugins
 from .Models import ClusterMaterial, LocalMaterial
 
@@ -91,21 +88,22 @@ class SendMaterialJob(Job):
     #
     #   \param materials_to_send A set with id's of materials that must be sent.
     def _sendMaterials(self, materials_to_send: Set[str]) -> None:
-        file_paths = Resources.getAllResourcesOfType(CuraApplication.ResourceTypes.MaterialInstanceContainer)
+        container_registry = CuraApplication.getInstance().getContainerRegistry()
+        material_manager = CuraApplication.getInstance().getMaterialManager()
+        material_group_dict = material_manager.getAllMaterialGroups()
 
-        # Find all local material files and send them if needed.
-        for file_path in file_paths:
-            try:
-                mime_type = MimeTypeDatabase.getMimeTypeForFile(file_path)
-            except MimeTypeDatabase.MimeTypeNotFoundError:
+        for root_material_id in material_group_dict:
+            if root_material_id not in materials_to_send:
+                # If the material does not have to be sent we skip it.
+                continue
+
+            file_path = container_registry.getContainerFilePathById(root_material_id)
+            if not file_path:
+                Logger.log("e", "Cannot get file path for material container [%s]", root_material_id)
                 continue
 
             file_name = os.path.basename(file_path)
-            material_id = urllib.parse.unquote_plus(mime_type.stripExtension(file_name)).lower()
-            if material_id not in materials_to_send:
-                # If the material does not have to be sent we skip it.
-                continue
-            self._sendMaterialFile(file_path, file_name, material_id)
+            self._sendMaterialFile(file_path, file_name, root_material_id)
 
     ##  Send a single material file to the printer.
     #
@@ -115,7 +113,6 @@ class SendMaterialJob(Job):
     #   \param file_name The name of the material file.
     #   \param material_id The ID of the material in the file.
     def _sendMaterialFile(self, file_path: str, file_name: str, material_id: str) -> None:
-
         parts = []
 
         # Add the material file.
@@ -170,28 +167,31 @@ class SendMaterialJob(Job):
     #   \return a dictionary of LocalMaterial objects by GUID
     def _getLocalMaterials(self) -> Dict[str, LocalMaterial]:
         result = {}  # type: Dict[str, LocalMaterial]
-        container_registry = Application.getInstance().getContainerRegistry()
-        material_containers = container_registry.findContainersMetadata(type = "material")
+        material_manager = CuraApplication.getInstance().getMaterialManager()
+
+        material_group_dict = material_manager.getAllMaterialGroups()
 
         # Find the latest version of all material containers in the registry.
-        for material in material_containers:
+        for root_material_id, material_group in material_group_dict.items():
+            material_metadata = material_group.root_material_node.getMetadata()
+
             try:
                 # material version must be an int
-                material["version"] = int(material["version"])
+                material_metadata["version"] = int(material_metadata["version"])
 
                 # Create a new local material
-                local_material = LocalMaterial(**material)
-                local_material.id = material["base_file"].lower()  # Don't compare each profile, only base materials.
+                local_material = LocalMaterial(**material_metadata)
+                local_material.id = root_material_id
 
                 if local_material.GUID not in result or \
                         local_material.version > result.get(local_material.GUID).version:
                     result[local_material.GUID] = local_material
 
             except KeyError:
-                Logger.logException("w", "Local material {} has missing values.".format(material["id"]))
+                Logger.logException("w", "Local material {} has missing values.".format(material_metadata["id"]))
             except ValueError:
-                Logger.logException("w", "Local material {} has invalid values.".format(material["id"]))
+                Logger.logException("w", "Local material {} has invalid values.".format(material_metadata["id"]))
             except TypeError:
-                Logger.logException("w", "Local material {} has invalid values.".format(material["id"]))
+                Logger.logException("w", "Local material {} has invalid values.".format(material_metadata["id"]))
 
         return result