Merge branch 'master' into feature_extruder_warning_icon

# Conflicts:
#	resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

cura/Settings/ContainerManager.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os
@@ -221,6 +221,7 @@ class ContainerManager(QObject):
         except OSError:
             return {"status": "error", "message": "Unable to write to this location.", "path": file_url}
 
+        Logger.info("Successfully exported container to {path}".format(path = file_url))
         return {"status": "success", "message": "Successfully exported container", "path": file_url}
 
     @pyqtSlot(QUrl, result = "QVariantMap")
@@ -240,6 +241,7 @@ class ContainerManager(QObject):
             file_url = file_url_or_string.toLocalFile()
         else:
             file_url = file_url_or_string
+        Logger.info(f"Importing material from {file_url}")
 
         if not file_url or not os.path.exists(file_url):
             return {"status": "error", "message": "Invalid path"}

cura/Settings/CuraContainerRegistry.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os
@@ -381,9 +381,10 @@ class CuraContainerRegistry(ContainerRegistry):
             if profile_count > 1:
                 continue
             # Only one profile found, this should not ever be the case, so that profile needs to be removed!
-            Logger.log("d", "Found an invalid quality_changes profile with the name %s. Going to remove that now", profile_name)
             invalid_quality_changes = ContainerRegistry.getInstance().findContainersMetadata(name=profile_name)
-            self.removeContainer(invalid_quality_changes[0]["id"])
+            if invalid_quality_changes:
+                Logger.log("d", "Found an invalid quality_changes profile with the name %s. Going to remove that now", profile_name)
+                self.removeContainer(invalid_quality_changes[0]["id"])
 
     @override(ContainerRegistry)
     def _isMetadataValid(self, metadata: Optional[Dict[str, Any]]) -> bool:
@@ -400,7 +401,9 @@ class CuraContainerRegistry(ContainerRegistry):
         try:
             if int(metadata["setting_version"]) != cura.CuraApplication.CuraApplication.SettingVersion:
                 return False
-        except ValueError: #Not parsable as int.
+        except ValueError:  # Not parsable as int.
+            return False
+        except TypeError:  # Expecting string input here, not e.g. list or anything.
             return False
         return True
 

cura/Settings/GlobalStack.py

@@ -86,6 +86,14 @@ class GlobalStack(CuraContainerStack):
     def supportsNetworkConnection(self):
         return self.getMetaDataEntry("supports_network_connection", False)
 
+    @pyqtProperty(bool, constant = True)
+    def supportsMaterialExport(self):
+        """
+        Whether the printer supports Cura's export format of material profiles.
+        :return: ``True`` if it supports it, or ``False`` if not.
+        """
+        return self.getMetaDataEntry("supports_material_export", False)
+
     @classmethod
     def getLoadingPriority(cls) -> int:
         return 2

cura/Settings/MachineNameValidator.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import pyqtSlot, pyqtProperty, QObject, pyqtSignal, QRegExp
@@ -23,7 +23,7 @@ class MachineNameValidator(QObject):
         #Compute the validation regex for printer names. This is limited by the maximum file name length.
         try:
             filename_max_length = os.statvfs(Resources.getDataStoragePath()).f_namemax
-        except AttributeError: #Doesn't support statvfs. Probably because it's not a Unix system.
+        except (AttributeError, EnvironmentError):  # Doesn't support statvfs. Probably because it's not a Unix system. Or perhaps there is no permission or it doesn't exist.
             filename_max_length = 255 #Assume it's Windows on NTFS.
         machine_name_max_length = filename_max_length - len("_current_settings.") - len(ContainerRegistry.getMimeTypeForContainer(InstanceContainer).preferredSuffix)
         # Characters that urllib.parse.quote_plus escapes count for 12! So now