3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 07:41:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Ghostkeeper 2018-05-16 17:01:46 +02:00
commit e9d2623237
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/CuraPackageManager.py
View file

@ -338,13 +338,7 @@ class CuraPackageManager(QObject):
with zipfile.ZipFile(filename) as archive: with zipfile.ZipFile(filename) as archive:
# Go through all the files and use the first successful read as the result # Go through all the files and use the first successful read as the result
for file_info in archive.infolist(): for file_info in archive.infolist():
is_dir = lambda file_info: file_info.filename.endswith('/') if file_info.filename.endswith("LICENSE"):
if is_dir or not file_info.filename.startswith("files/"):
continue
filename_parts = os.path.basename(file_info.filename.lower()).split(".")
stripped_filename = filename_parts[0]
if stripped_filename in ("license", "licence"):
Logger.log("d", "Found potential license file '%s'", file_info.filename) Logger.log("d", "Found potential license file '%s'", file_info.filename)
try: try:
with archive.open(file_info.filename, "r") as f: with archive.open(file_info.filename, "r") as f: