From 707cf492d030dc79a8e8a002e10d756638df2428 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 7 Sep 2023 06:00:06 +0800 Subject: [PATCH] add recursive package search --- jpacrepo_uploader/uploader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jpacrepo_uploader/uploader.py b/jpacrepo_uploader/uploader.py index 1bfec9a..95bf08b 100644 --- a/jpacrepo_uploader/uploader.py +++ b/jpacrepo_uploader/uploader.py @@ -28,7 +28,7 @@ logger = logging.getLogger('jpacrepo.uploader') package_file_pattern = re.compile('.*\.pkg\.tar\.(xz|zst|gz)$') _size_uoms = ('B', 'KiB', 'MiB', 'GiB', 'KiB') - +_supported_compression_formats = ('xz', 'zst', 'gz') def format_filesize(size: int) -> str: counter = 0 @@ -195,8 +195,8 @@ class JpacrepoClient: raise RuntimeError(f'Received HTTP error code: {response.code}') def packages_to_upload(self) -> tuple[Path, ...]: - package_files: dict[str, Path] = {file.name: file for package_cache in self.config.repo_folders - for file in package_cache.iterdir() + package_files: dict[str, Path] = {file.name: file for ext in _supported_compression_formats for package_cache in self.config.repo_folders + for file in package_cache.glob(f'**/*.pkg.tar.{ext}') if file.is_file() and package_file_pattern.match(file.name)} headers = { 'Accept': 'application/json',