GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 20:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-7608 Ignore machine network information when handling project files (#8116)

Browse Source 
CURA-7608
This commit is contained in:
Konstantinos Karmas 2020-07-28 09:57:10 +02:00 committed by GitHub
parent d6a2c1d46d
commit 7bf1af99a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/3MFWriter/ThreeMFWorkspaceWriter.py
View File

@ -136,7 +136,17 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
file_in_archive.compress_type = zipfile.ZIP_DEFLATED
# Do not include the network authentication keys
ignore_keys = {"network_authentication_id", "network_authentication_key", "octoprint_api_key"}
ignore_keys = {
"um_cloud_cluster_id",
"um_network_key",
"um_linked_to_account",
"removal_warning",
"host_guid",
"group_name",
"group_size",
"connection_type",
"octoprint_api_key"
}
serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
archive.writestr(file_in_archive, serialized_data)

17
plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
View File

@ -25,6 +25,18 @@ _removed_settings = {
"support_tree_enable"
} # type: Set[str]
_removed_machine_network_metadata = {
"um_cloud_cluster_id",
"um_network_key",
"um_linked_to_account",
"host_guid",
"removal_warning",
"group_name",
"group_size",
"connection_type"
} # type: Set[str]
class VersionUpgrade462to47(VersionUpgrade):
def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""
@ -136,6 +148,11 @@ class VersionUpgrade462to47(VersionUpgrade):
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "15"
# Remove machine network information from project file
for network_info in _removed_machine_network_metadata:
if network_info in parser["metadata"]:
del parser["metadata"][network_info]
# Update Pause at Height script parameters if present.
if "post_processing_scripts" in parser["metadata"]:
new_scripts_entries = []