Fix filename decoding issue for zip files archived by macOS #75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
fcollonval
requested changes
Nov 25, 2021
There was a problem hiding this comment.
Thanks @Wh1isper
I have a couple of suggestions. And could you update the workflow .github/workflows/build.yml on all OSes, so the tests will cover this use case.
| with reader as f: | ||
| for fn in f.namelist(): | ||
| extreact_path = pathlib.Path(f.extract(fn, path=destination)) | ||
| correct_filename = try_macos_decode(fn) or try_windows_chinese_decode(fn) or fn |
There was a problem hiding this comment.
Could you change this a bit to use a single function that has the following structure:
def decode_filename(fn):
try:
encoded_filename = fn.encode('cp437')
try:
# MacOS encoding
return encoded_filename.decode('utf-8')
except UnicodeError:
# Windows encoding
return encoded_filename.decode('gbk')
except UnicodeError:
return fn| for fn in f.namelist(): | ||
| extreact_path = pathlib.Path(f.extract(fn, path=destination)) | ||
| correct_filename = try_macos_decode(fn) or try_windows_chinese_decode(fn) or fn | ||
| extreact_path.rename(os.path.join(destination, correct_filename)) |
There was a problem hiding this comment.
destination is a Path, so you can write:
Suggested change
| extreact_path.rename(os.path.join(destination, correct_filename)) | |
| extracted_path.rename(destination / correct_filename) |
| # *nix zip utilities silently uses system encoding(utf-8 generally) | ||
| with reader as f: | ||
| for fn in f.namelist(): | ||
| extreact_path = pathlib.Path(f.extract(fn, path=destination)) |
There was a problem hiding this comment.
Fix wording
Suggested change
| extreact_path = pathlib.Path(f.extract(fn, path=destination)) | |
| extracted_path = pathlib.Path(f.extract(fn, path=destination)) |
|
|
||
| self.log.info("Finished extracting {} to {}.".format(archive_path, archive_destination)) | ||
|
|
||
|
|
||
|
|
|
well, I found this is not a good way to solve this problem |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this is how I fix #74