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