From f4aa174efa15d42cd304374d57603a97336e3fb7 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Thu, 16 Dec 2021 12:37:20 +0100
Subject: [PATCH] Fixed repack cli after rebase.
---
nomad/cli/admin/uploads.py | 14 +++++++++-----
tests/test_cli.py | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/nomad/cli/admin/uploads.py b/nomad/cli/admin/uploads.py
index fa01c500b9..40653fa429 100644
--- a/nomad/cli/admin/uploads.py
+++ b/nomad/cli/admin/uploads.py
@@ -461,13 +461,17 @@ def process(ctx, uploads, parallel: int, process_running: bool, setting: typing.
@uploads.command(help='Repack selected uploads.')
@click.argument('UPLOADS', nargs=-1)
-@click.option('--parallel', default=1, type=int, help='Use the given amount of parallel processes. Default is 1.')
@click.pass_context
-def re_pack(ctx, uploads, parallel: int):
+def re_pack(ctx, uploads):
_, uploads = _query_uploads(uploads, **ctx.obj.uploads_kwargs)
- _run_processing(
- uploads, parallel, lambda upload: upload.re_pack(), 're-packing',
- wait_until_complete=False)
+
+ for upload in uploads:
+ if not upload.published:
+ print(f'Cannot repack unpublished upload {upload.upload_id}')
+ continue
+
+ upload.upload_files.re_pack(upload.with_embargo)
+ print(f'successfully re-packed {upload.upload_id}')
@uploads.command(help='Attempt to abort the processing of uploads.')
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 9cffd15b44..670d08393d 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -233,7 +233,7 @@ class TestAdminUploads:
published.save()
result = invoke_cli(
- cli, ['admin', 'uploads', 're-pack', '--parallel', '2', upload_id], catch_exceptions=False)
+ cli, ['admin', 'uploads', 're-pack', upload_id], catch_exceptions=False)
assert result.exit_code == 0
assert 're-pack' in result.stdout
--
GitLab