github/github-spec-kit
1
0
Fork 0
mirror of https://github.com/github/spec-kit.git synced 2026-07-03 12:28:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix type hint, add null checks for tf.extractfile() return value

Browse Source 
Agent-Logs-Url: https://github.com/github/spec-kit/sessions/9fb9a8ea-0967-4baf-b95c-7101e423ff58

Co-authored-by: mnriem <15701806+mnriem@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-28 18:14:52 +00:00
committed by GitHub
parent d78ead1802
commit 0c6cc4502c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/specify_cli/__init__.py
View File

@@ -4331,12 +4331,16 @@ def extension_update(
# First try root-level extension.yml
try:
m = tf.getmember("extension.yml")
manifest_data = yaml.safe_load(tf.extractfile(m).read()) or {}
f = tf.extractfile(m)
if f is not None:
manifest_data = yaml.safe_load(f.read()) or {}
except KeyError:
# Look for extension.yml in a single top-level subdirectory
members = [m for m in tf.getmembers() if m.name.endswith("/extension.yml") and m.name.count("/") == 1]
if len(members) == 1:
manifest_data = yaml.safe_load(tf.extractfile(members[0]).read()) or {}
f = tf.extractfile(members[0])
if f is not None:
manifest_data = yaml.safe_load(f.read()) or {}
else:
with zipfile.ZipFile(zip_path, "r") as zf:
namelist = zf.namelist()
@@ -4928,7 +4932,9 @@ def _extract_workflow_yml(archive_path: Path, archive_fmt: str) -> bytes:
with tarfile.open(archive_path, "r:gz") as tf:
# Try root-level first.
try:
return tf.extractfile(tf.getmember("workflow.yml")).read()
f = tf.extractfile(tf.getmember("workflow.yml"))
if f is not None:
return f.read()
except KeyError:
pass
# Look in a single top-level subdirectory.
@@ -4937,7 +4943,9 @@ def _extract_workflow_yml(archive_path: Path, archive_fmt: str) -> bytes:
if m.name.endswith("/workflow.yml") and m.name.count("/") == 1
]
if len(candidates) == 1:
return tf.extractfile(candidates[0]).read()
f = tf.extractfile(candidates[0])
if f is not None:
return f.read()
else:
with zipfile.ZipFile(archive_path, "r") as zf:
namelist = zf.namelist()

2
src/specify_cli/extensions.py
View File

@@ -146,7 +146,7 @@ def _detect_archive_format(url: str, content_type: str = "") -> str:
def _safe_extract_tarball(
archive_path: Path,
dest_dir: Path,
error_class: type = Exception,
error_class: "type[Exception]" = Exception,
) -> None:
"""Safely extract a ``.tar.gz`` or ``.tgz`` archive into *dest_dir*.