Simplify code, move some code out of the loop (#2685)
This commit is contained in:
@@ -186,13 +186,12 @@ class S3Storage(BaseStorage):
|
|||||||
files = os.listdir(download_dir)
|
files = os.listdir(download_dir)
|
||||||
sc = await self._get_storage_class_for_org(organization_id)
|
sc = await self._get_storage_class_for_org(organization_id)
|
||||||
tags = await self._get_tags_for_org(organization_id)
|
tags = await self._get_tags_for_org(organization_id)
|
||||||
|
base_uri = f"s3://{settings.AWS_S3_BUCKET_UPLOADS}/{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/{workflow_run_id or task_id}"
|
||||||
for file in files:
|
for file in files:
|
||||||
fpath = os.path.join(download_dir, file)
|
fpath = os.path.join(download_dir, file)
|
||||||
if not os.path.isfile(fpath):
|
if not os.path.isfile(fpath):
|
||||||
continue
|
continue
|
||||||
uri = f"s3://{settings.AWS_S3_BUCKET_UPLOADS}/{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/{workflow_run_id or task_id}/{file}"
|
uri = f"{base_uri}/{file}"
|
||||||
|
|
||||||
# Calculate SHA-256 checksum
|
|
||||||
checksum = calculate_sha256_for_file(fpath)
|
checksum = calculate_sha256_for_file(fpath)
|
||||||
LOG.info(
|
LOG.info(
|
||||||
"Calculated checksum for file",
|
"Calculated checksum for file",
|
||||||
|
|||||||
Reference in New Issue
Block a user