diff --git a/pyproject.toml b/pyproject.toml index 6813a75..532fb59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "jpacrepo-uploader" -version = "0.0.6" +version = "0.0.7" authors = [ { name="Walter Oggioni", email="oggioni.walter@gmail.com" }, ] diff --git a/src/jpacrepo_uploader/uploader.py b/src/jpacrepo_uploader/uploader.py index dfb5c83..016185e 100644 --- a/src/jpacrepo_uploader/uploader.py +++ b/src/jpacrepo_uploader/uploader.py @@ -33,6 +33,7 @@ package_file_pattern = re.compile('.*\\.pkg\\.tar\\.(xz|zst|gz)$') _supported_compression_formats = ('xz', 'zst', 'gz') +terminal_size = shutil.get_terminal_size(fallback=(80, 24)) class HttpException(Exception): http_status_code : int @@ -62,8 +63,7 @@ class PackageUploadProgressBar(Bar): **kwargs: Any): kwargs.setdefault('suffix', 'speed: %(total_speed)s, completed: %(percent).2f%% - ETA: %(eta_td)s') - terminal_size = shutil.get_terminal_size(fallback=(80, 24)) - kwargs.setdefault('width', terminal_size[0] - 80) + kwargs.setdefault('width', terminal_size[0] - 96) super().__init__(*args, **kwargs) self.uploaded_size = uploaded_size self.packages_total_size = packages_total_size @@ -263,10 +263,10 @@ class JpacrepoClient: start_ts = monotonic() for i, file in enumerate(files): upload_size = file.stat().st_size - if len(file.name) <= 16: + if len(file.name) <= 32: filename = file.name else: - filename = file.name[:14] + '...' + filename = file.name[:29] + '...' kwargs = dict( max=upload_size, message=f'({i + 1}/{len(files)}) {filename}',