Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: zip can contain directories and files at the root #11

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Fix: zip can contain directories and files at the root #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d88897
Fix: zip can contain directories and files at the root
jteulade Mar 7, 2024
2c483cf
Add detail in comment + bugfix in CHANGES.mdÃ
jteulade Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 1.36.1 (2024-xx-xx)

- FIX: Fix `files.extract_file` when there is a file in the root of the zip archive ([#11](https://github.com/sertit/sertit-utils/pull/11))
- FIX: Fix `geometry.nearest_neighbors` when k is bigger than the number of candidates
- DOC: Update some examples in documentation

Expand Down
5 changes: 4 additions & 1 deletion sertit/files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ def extract_file(
if file_path.suffix == ".zip":
# Manage the case with several directories inside one zipfile
arch = zipfile.ZipFile(file_path, "r")
extr_names = list({p.split("/")[0] for p in arch.namelist()})

# zipfile.namelist returns the relative path of the file names in the archive
# if a file is in the root of the archive, there is no "/", so it should not be included
extr_names = list({p.split("/")[0] for p in arch.namelist() if "/" in p})
elif file_path.suffix == ".tar" or file_path.suffixes == [".tar", ".gz"]:
# Tar files have no subdirectories, so create one
extr_names = [path.get_filename(file_path)]
Expand Down