3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Guard against unexpected file structures

Browse source 
We shouldn't break on that.

Contributes to issue CURA-7024.
This commit is contained in:
Ghostkeeper 2020-02-04 15:52:12 +01:00
parent a1f3444271
commit 3513266549
No known key found for this signature in database
GPG key ID: 37E2020986774393
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py
View file

@ -72,7 +72,12 @@ class VersionUpgrade44to45(VersionUpgrade):
dirs[:] = [dir for dir in dirs if dir not in exclude_directories] dirs[:] = [dir for dir in dirs if dir not in exclude_directories]
for filename in fnmatch.filter(files, "*.global.cfg"): for filename in fnmatch.filter(files, "*.global.cfg"):
parser = configparser.ConfigParser(interpolation = None) parser = configparser.ConfigParser(interpolation = None)
parser.read(os.path.join(root, filename)) try:
parser.read(os.path.join(root, filename))
except OSError: # File not found or insufficient rights.
continue
except configparser.Error: # Invalid file format.
continue
if "metadata" in parser and "hidden" in parser["metadata"] and parser["metadata"]["hidden"] == "True": if "metadata" in parser and "hidden" in parser["metadata"] and parser["metadata"]["hidden"] == "True":
stack_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0]) stack_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0])
hidden_global_stacks.add(stack_id) hidden_global_stacks.add(stack_id)
@ -89,7 +94,12 @@ class VersionUpgrade44to45(VersionUpgrade):
dirs[:] = [dir for dir in dirs if dir not in exclude_directories] dirs[:] = [dir for dir in dirs if dir not in exclude_directories]
for filename in fnmatch.filter(files, "*.extruder.cfg"): for filename in fnmatch.filter(files, "*.extruder.cfg"):
parser = configparser.ConfigParser(interpolation = None) parser = configparser.ConfigParser(interpolation = None)
parser.read(os.path.join(root, filename)) try:
parser.read(os.path.join(root, filename))
except OSError: # File not found or insufficient rights.
continue
except configparser.Error: # Invalid file format.
continue
if "metadata" in parser and "machine" in parser["metadata"] and parser["metadata"]["machine"] in hidden_global_stacks: if "metadata" in parser and "machine" in parser["metadata"] and parser["metadata"]["machine"] in hidden_global_stacks:
stack_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0]) stack_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0])
hidden_extruder_stacks.add(stack_id) hidden_extruder_stacks.add(stack_id)
@ -107,7 +117,10 @@ class VersionUpgrade44to45(VersionUpgrade):
for filename in fnmatch.filter(files, "*.inst.cfg"): for filename in fnmatch.filter(files, "*.inst.cfg"):
container_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0]) container_id = urllib.parse.unquote_plus(os.path.basename(filename).split(".")[0])
if container_id in hidden_instance_containers: if container_id in hidden_instance_containers:
os.remove(os.path.join(root, filename)) try:
os.remove(os.path.join(root, filename))
except OSError: # Is a directory, file not found, or insufficient rights.
continue
def getCfgVersion(self, serialised: str) -> int: def getCfgVersion(self, serialised: str) -> int:
parser = configparser.ConfigParser(interpolation = None) parser = configparser.ConfigParser(interpolation = None)