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

Allow Galaxy downloader to trust collection cache #78

Merged
merged 10 commits into from
May 2, 2023
Merged

Allow Galaxy downloader to trust collection cache #78

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
015571a
Normalize the collection cache filename so we don't depend on Galaxy …
felixfontein Apr 30, 2023
e6cda28
Allow to trust collection cache.
felixfontein Apr 30, 2023
39bd6d6
Improve docs, add to sample config.
felixfontein May 1, 2023
e6395f3
Follow-up to previous PR.
felixfontein May 1, 2023
5d32b81
Fix typo.
felixfontein May 1, 2023
7be638b
Improvements from review.
felixfontein May 2, 2023
8f8ac01
Use antsibull_core.utils.io.copy_file instead of shutil.copyfile.
felixfontein May 2, 2023
0dc2a04
Skip check part of copying.
felixfontein May 2, 2023
83040d5
Reformat.
felixfontein May 2, 2023
79bfee3
Update changelog.
felixfontein May 2, 2023
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
6 changes: 3 additions & 3 deletions src/antsibull_core/galaxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ async def download(
if self.collection_cache and self.trust_collection_cache:
cached_copy = os.path.join(self.collection_cache, filename)
if os.path.isfile(cached_copy):
await copy_file(cached_copy, download_filename)
await copy_file(cached_copy, download_filename, check_content=False)
return download_filename

release_info = await self.get_release_info(f"{namespace}/{name}", version)
Expand All @@ -447,7 +447,7 @@ async def download(
cached_copy = os.path.join(self.collection_cache, filename)
if os.path.isfile(cached_copy):
if await verify_hash(cached_copy, sha256sum):
await copy_file(cached_copy, download_filename)
await copy_file(cached_copy, download_filename, check_content=False)
return download_filename

async with retry_get(
Expand All @@ -471,7 +471,7 @@ async def download(
# Copy downloaded collection into cache
if self.collection_cache:
cached_copy = os.path.join(self.collection_cache, filename)
await copy_file(download_filename, cached_copy)
await copy_file(download_filename, cached_copy, check_content=False)

return download_filename

Expand Down
8 changes: 6 additions & 2 deletions src/antsibull_core/utils/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,22 @@
mlog = log.fields(mod=__name__)


async def copy_file(source_path: StrOrBytesPath, dest_path: StrOrBytesPath) -> None:
async def copy_file(source_path: StrOrBytesPath, dest_path: StrOrBytesPath,
check_content: bool = True) -> None:
"""
Copy content from one file to another.

:arg source_path: Source path. Must be a file.
:arg dest_path: Destination path.
:kwarg check_content: If ``True`` (default) and ``lib_ctx.file_check_content > 0`` and the
destination file exists, first check whether source and destination are potentially equal
before actually copying,
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
"""
flog = mlog.fields(func="copy_file")
flog.debug("Enter")

lib_ctx = app_context.lib_ctx.get()
if lib_ctx.file_check_content > 0:
if check_content and lib_ctx.file_check_content > 0:
# Check whether the destination file exists and has the same content as the source file,
# in which case we won't overwrite the destination file
try:
Expand Down