diff --git a/src/onc/modules/_OncDelivery.py b/src/onc/modules/_OncDelivery.py index 59d4139..bc210b2 100644 --- a/src/onc/modules/_OncDelivery.py +++ b/src/onc/modules/_OncDelivery.py @@ -387,7 +387,8 @@ def _printProductOrderStats(self, fileList: list, runInfo: dict): print(f"Total download Time: {txtDownTime}") # Print size and count of files - print(f"{downloadCount} files ({humanize.naturalsize(size)}) downloaded") + natural_size = humanize.naturalsize(size, binary=True) + print(f"{downloadCount} files ({natural_size}) downloaded") else: print("No files downloaded.") diff --git a/src/onc/modules/_util.py b/src/onc/modules/_util.py index 37c1a8c..16db3fb 100644 --- a/src/onc/modules/_util.py +++ b/src/onc/modules/_util.py @@ -24,7 +24,7 @@ def saveAsFile( raise FileExistsError(filePath) start = time.time() - size = 0 + size = len(response.content) with open(filePath, "wb") as file: file.write(response.content) diff --git a/tests/data_product_delivery/test_data_product_delivery_order.py b/tests/data_product_delivery/test_data_product_delivery_order.py index 17ff728..7b16df2 100644 --- a/tests/data_product_delivery/test_data_product_delivery_order.py +++ b/tests/data_product_delivery/test_data_product_delivery_order.py @@ -40,6 +40,8 @@ def test_valid_no_metadata(requester, params, expected_keys_download_results, ut assert data["downloadResults"][0]["index"] == "1" assert data["downloadResults"][0]["downloaded"] is True + assert data["stats"]["totalSize"] != 0 + assert util.get_download_files_num(requester) == 2, "The first two are png files." util.assert_dict_key_types(