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

Support zstd-compressed repositories, including streaming compression #32

Merged
merged 1 commit into from
Jul 18, 2024
+6 −6
Merged

Support zstd-compressed repositories, including streaming compression #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"python-dateutil>=2.8.1,<3",
"botocore>=1.23.50,<2",
"lxml>=4.6.5,<5",
"zstd>=1.5.5.1",
"zstandard>=0.21.0",
]

[project.optional-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rpm_s3_mirror.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Requires: python3-requests
Requires: python3-dateutil
Requires: python3-botocore
Requires: python3-lxml
Requires: python3-zstd
Requires: python3-zstandard
Requires: systemd
Requires: zchunk

Expand Down
8 changes: 4 additions & 4 deletions rpm_s3_mirror/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
import dataclasses
import lzma
import zstd
import zstandard
import re
import subprocess
from abc import abstractmethod
Expand Down Expand Up @@ -215,9 +215,9 @@ def _compress(self, root, open_size, open_checksum):

def decompress(filename: Path | str) -> bytes:
try:
with open(filename, "rb") as f:
return zstd.decompress(f.read())
except zstd.Error:
with zstandard.open(filename) as f:
return f.read()
except zstandard.ZstdError:
with gzip.open(filename) as f:
return f.read()

Expand Down