Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cura
diff options
context:
space:
mode:
authorj.delarago <joeydelarago@gmail.com>2022-06-15 16:47:17 +0300
committerj.delarago <joeydelarago@gmail.com>2022-06-15 16:47:17 +0300
commit8c2ac9f21ebadd05d04a778027c44da343c6a342 (patch)
tree4c6265891ed7d3c201b9664ee6260bba774bba3d /cura
parent4e80d170d188863b1d8116e6d5d8470f721565aa (diff)
Remove excessive logs, make path search recursive for materials.CURA-8610_save_required_packages_metadata
CURA-8610
Diffstat (limited to 'cura')
-rw-r--r--cura/CuraPackageManager.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py
index fbede6d08b..da71021d1f 100644
--- a/cura/CuraPackageManager.py
+++ b/cura/CuraPackageManager.py
@@ -62,8 +62,7 @@ class CuraPackageManager(PackageManager):
for path in Resources.getSecureSearchPaths():
# Secure search paths are install directory paths, if a material is in here it must be bundled.
- paths = [Path(p) for p in glob.glob(path + '/**/*.xml.fdm_material')]
- Logger.info(f"All bundled Materials Found: {[str(path) for path in paths]}")
+ paths = [Path(p) for p in glob.glob(path + '/**/*.xml.fdm_material', recursive=True)]
for material in paths:
if material.name == file_name:
Logger.info(f"Found bundled material: {material.name}. Located in path: {str(material)}")
@@ -81,15 +80,14 @@ class CuraPackageManager(PackageManager):
def getMaterialFilePackageId(self, file_name: str, guid: str) -> str:
"""Get the id of the installed material package that contains file_name"""
- Logger.info(f'Searching paths for package: {[f for f in os.scandir(self._installation_dirs_dict["materials"]) if f.is_dir()]}')
for material_package in [f for f in os.scandir(self._installation_dirs_dict["materials"]) if f.is_dir()]:
package_id = material_package.name
+
for root, _, file_names in os.walk(material_package.path):
if file_name not in file_names:
# File with the name we are looking for is not in this directory
continue
- Logger.info(f"Found file: {file_name}")
- Logger.info(f"Attempting to open {os.path.join(root, file_name)}")
+
with open(os.path.join(root, file_name), encoding="utf-8") as f:
# Make sure the file we found has the same guid as our material
# Parsing this xml would be better but the namespace is needed to search it.