Refactor cache save to create a list of files to compress and reuse existing function#18320
Merged
memsharded merged 5 commits intoconan-io:develop2from May 20, 2025
Merged
Conversation
memsharded
reviewed
May 16, 2025
memsharded
approved these changes
May 16, 2025
Member
memsharded
left a comment
memsharded
left a comment
There was a problem hiding this comment.
Looks good, just might be worth double checking on the pkglist.json change possible effects
AbrilRBS
approved these changes
May 17, 2025
Member
AbrilRBS
left a comment
AbrilRBS
left a comment
There was a problem hiding this comment.
Besides the already proposed test, this looks great
memsharded
reviewed
May 19, 2025
memsharded
reviewed
May 19, 2025
Co-authored-by: James <memsharded@gmail.com>
memsharded
approved these changes
May 19, 2025
AbrilRBS
approved these changes
May 19, 2025
| save(pkglist_path, serialized) | ||
| tar_files["pkglist.json"] = pkglist_path | ||
| compress_files(tar_files, os.path.basename(tgz_path), os.path.dirname(tgz_path), compresslevel, recursive=True) | ||
| remove(pkglist_path) |
Member
There was a problem hiding this comment.
If we want to keep this remove, shouldn't it be affecting the whole folder
Member
There was a problem hiding this comment.
What do you mean? I am not sure I understood your comment
| if os.path.exists(path): | ||
| tgz.add(path, f"{recipe_folder}/{f}", recursive=True) | ||
| path = os.path.join(cache_folder, recipe_folder, DOWNLOAD_EXPORT_FOLDER, METADATA) | ||
| tar_files: dict[str,str] = {} # {path_in_tar: abs_path} |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changelog: omit
Docs: omit
As suggested in #18314 (comment)
This PR will simplify #18314 by modifying the compression functionality on cache save command.
Intead of creating a tar object and adding files one by one (very coupled interface with tarfile module), create a list of files which will be passed to a already existing method in conan
compress_files.This method may be moved to another module in a future PR.