From c14aa2236c1613b5932bdbf2d442f89510221545 Mon Sep 17 00:00:00 2001 From: Daniel Bernstein Date: Wed, 18 Dec 2024 10:25:17 -0800 Subject: [PATCH] Change CM_REPORT_PREFIX to DOWNLOADS_PREFIX --- .../manager/celery/tasks/generate_inventory_and_hold_reports.py | 2 +- src/palace/manager/scripts/playtime_entries.py | 2 +- src/palace/manager/service/storage/s3.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/palace/manager/celery/tasks/generate_inventory_and_hold_reports.py b/src/palace/manager/celery/tasks/generate_inventory_and_hold_reports.py index 919d8a630..8748cefb3 100644 --- a/src/palace/manager/celery/tasks/generate_inventory_and_hold_reports.py +++ b/src/palace/manager/celery/tasks/generate_inventory_and_hold_reports.py @@ -150,7 +150,7 @@ def run(self) -> None: uid = uuid.uuid4() key = ( - f"{S3Service.CM_REPORT_PREFIX}/inventory_and_holds/{library.short_name}/" + f"{S3Service.DOWNLOADS_PREFIX}/inventory_and_holds/{library.short_name}/" f"inventory-and-holds-for-library-{file_name_modifier}-{uid}.zip" ) self.s3_service.store_stream( diff --git a/src/palace/manager/scripts/playtime_entries.py b/src/palace/manager/scripts/playtime_entries.py index 74e9c846f..c52033cfb 100644 --- a/src/palace/manager/scripts/playtime_entries.py +++ b/src/palace/manager/scripts/playtime_entries.py @@ -213,7 +213,7 @@ def do_run(self): if recipient: uid = uuid.uuid4() key = ( - f"{S3Service.CM_REPORT_PREFIX}/{reporting_name}/" + f"{S3Service.DOWNLOADS_PREFIX}/{reporting_name}/" f"{linked_file_name}" ) diff --git a/src/palace/manager/service/storage/s3.py b/src/palace/manager/service/storage/s3.py index 67b1c1c5a..7a34f3fde 100644 --- a/src/palace/manager/service/storage/s3.py +++ b/src/palace/manager/service/storage/s3.py @@ -108,7 +108,7 @@ def exception(self) -> BaseException | None: class S3Service(LoggerMixin): MINIMUM_MULTIPART_UPLOAD_SIZE = 5 * 1024 * 1024 # 5MB - CM_REPORT_PREFIX = "cm_report" + DOWNLOADS_PREFIX = "downloads" def __init__( self,