3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Also added missing context usage of archive

Browse source
This commit is contained in:
Jaime van Kessel 2018-05-03 20:27:02 +02:00
parent 7665f8a7cb
commit 21e2fcbcf6
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cura/CuraPackageManager.py
View file

@ -1,7 +1,7 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional from typing import Optional, Dict, Any
import json import json
import os import os
import shutil import shutil
@ -324,23 +324,22 @@ class CuraPackageManager(QObject):
os.rename(old_file_path, new_file_path) os.rename(old_file_path, new_file_path)
# Gets package information from the given file. # Gets package information from the given file.
def getPackageInfo(self, filename: str) -> dict: def getPackageInfo(self, filename: str) -> Dict[str, Any]:
with zipfile.ZipFile(filename, "r") as archive: with zipfile.ZipFile(filename) as archive:
try: try:
# All information is in package.json # All information is in package.json
with archive.open("package.json", "r") as f: with archive.open("package.json") as f:
package_info_dict = json.loads(f.read().decode("utf-8")) package_info_dict = json.loads(f.read().decode("utf-8"))
return package_info_dict return package_info_dict
except Exception as e: except Exception as e:
Logger.logException("Could not get package information from file '%s': %s" % (filename, e)) Logger.logException("w", "Could not get package information from file '%s': %s" % (filename, e))
return {} return {}
# Gets the license file content if present in the given package file. # Gets the license file content if present in the given package file.
# Returns None if there is no license file found. # Returns None if there is no license file found.
def getPackageLicense(self, filename: str) -> Optional[str]: def getPackageLicense(self, filename: str) -> Optional[str]:
license_string = None license_string = None
archive = zipfile.ZipFile(filename) with zipfile.ZipFile(filename) as archive:
try:
# 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('/') is_dir = lambda file_info: file_info.filename.endswith('/')
@ -350,7 +349,7 @@ class CuraPackageManager(QObject):
filename_parts = os.path.basename(file_info.filename.lower()).split(".") filename_parts = os.path.basename(file_info.filename.lower()).split(".")
stripped_filename = filename_parts[0] stripped_filename = filename_parts[0]
if stripped_filename in ("license", "licence"): if stripped_filename in ("license", "licence"):
Logger.log("i", "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:
data = f.read() data = f.read()
@ -360,8 +359,4 @@ class CuraPackageManager(QObject):
Logger.logException("e", "Failed to load potential license file '%s' as text file.", Logger.logException("e", "Failed to load potential license file '%s' as text file.",
file_info.filename) file_info.filename)
license_string = None license_string = None
except Exception as e:
raise RuntimeError("Could not get package license from file '%s': %s" % (filename, e))
finally:
archive.close()
return license_string return license_string