diff options
Diffstat (limited to 'pyblackbird_cc/resources/views.py')
| -rw-r--r-- | pyblackbird_cc/resources/views.py | 114 |
1 files changed, 2 insertions, 112 deletions
diff --git a/pyblackbird_cc/resources/views.py b/pyblackbird_cc/resources/views.py index 4ce2472..09bdb9c 100644 --- a/pyblackbird_cc/resources/views.py +++ b/pyblackbird_cc/resources/views.py @@ -4,9 +4,6 @@ import tempfile from collections.abc import Generator from dataclasses import dataclass -import boto3 -from botocore.exceptions import ClientError -from botocore.utils import Path from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required @@ -22,22 +19,11 @@ from .forms import ResourceUpdateMetadataForm from .models import PDFPageSnapshot, ResourceSubcategory from .models import PDFResource from .models import Resource +from .s3 import get_presigned_obj_url, upload_files_to_s3, upload_to_s3 logger = logging.getLogger(__name__) -def _get_pdf_collection_type(coll) -> str: - if len(coll) == 1 and len(coll[0]) == 1: - return "SINGLE_PDF_SINGLE_PAGE" - if len(coll) == 1 and len(coll[0]) > 1: - return "SINGLE_PDF_MULTI_PAGE" - if len(coll) > 1: - for c in coll: - if len(c) > 1: - return "MULTI_PDF_MULTI_PAGE" - return "MULTI_PDF_SINGLE_PAGE" - - # I want to create a dataclass here to hold the resource information to pass to the view @dataclass class ResourceInfo: @@ -138,101 +124,6 @@ def index(request): return render(request, "resources/resource_list.html", context) -def get_presigned_obj_url(bucket_name, obj_name, expiration=3600) -> str | None: - client = boto3.client( - "s3", - endpoint_url=settings.AWS_S3_ENDPOINT_URL, - aws_access_key_id=settings.AWS_ACCESS_KEY_ID, - aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY, - region_name=settings.AWS_S3_REGION_NAME, - ) - logger.info("Client created", extra={"client": client}) - try: - response = client.generate_presigned_url( - "get_object", - Params={"Bucket": bucket_name, "Key": obj_name}, - ExpiresIn=expiration, - ) - except ClientError as e: - logger.exception("Error generating presigned URL", extra={"error": e}) - return None - return response - - -def upload_to_s3(pdf_files, thumbnail_files, snapshotted_pages) -> bool: - session = boto3.Session() - client = session.client( - "s3", - endpoint_url=settings.AWS_S3_ENDPOINT_URL, - aws_access_key_id=settings.AWS_ACCESS_KEY_ID, - aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY, - region_name=settings.AWS_S3_REGION_NAME, - ) - - try: - for pdf_file in pdf_files: - logger.info("Uploading {pdf_file.name} to S3") - client.upload_fileobj( - pdf_file, - settings.AWS_STORAGE_BUCKET_NAME, - f"pdfuploads/{pdf_file.name}", - ) - for f in thumbnail_files: - logger.info("Uploading {f.name} to S3") - client.upload_fileobj( - f, - settings.AWS_STORAGE_BUCKET_NAME, - f"thumbnails/{f.name}", - ) - if _get_pdf_collection_type(snapshotted_pages) == "SINGLE_PDF_SINGLE_PAGE" \ - or _get_pdf_collection_type(snapshotted_pages) == "SINGLE_PDF_MULTI_PAGE": - for img in snapshotted_pages[0]: - logger.info("Uploading {img} to S3") - client.upload_file( - img, - settings.AWS_STORAGE_BUCKET_NAME, - f"snapshotted_pages/{Path(img).name}", - ) - return True - if _get_pdf_collection_type(snapshotted_pages) == "MULTI_PDF_SINGLE_PAGE" \ - or _get_pdf_collection_type(snapshotted_pages) == "MULTI_PDF_MULTI_PAGE": - for pdf in snapshotted_pages: - for img in pdf: - logger.info("Uploading {img} to S3") - client.upload_file( - img, - settings.AWS_STORAGE_BUCKET_NAME, - f"snapshotted_pages/{Path(img).name}", - ) - return True - except ClientError: - logging.exception("Error uploading files to S3") - return False - - -def upload_thumbnails_to_s3(thumbnail_files) -> bool: - session = boto3.Session() - client = session.client( - "s3", - endpoint_url=settings.AWS_S3_ENDPOINT_URL, - aws_access_key_id=settings.AWS_ACCESS_KEY_ID, - aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY, - region_name=settings.AWS_S3_REGION_NAME, - ) - try: - for f in thumbnail_files: - logger.info(f"Uploading {f.name} to S3") - client.upload_fileobj( - f, - settings.AWS_STORAGE_BUCKET_NAME, - f"thumbnails/{f.name}", - ) - return True - except Exception as e: # Any exceptions generated by boto3 client will be caught here - logger.error(f"Error uploading thumbnail files to S3: {e}") - return False - - def _write_pdf_to_tempdir(f) -> str: temp_dir = tempfile.mkdtemp() file_path = os.path.join(temp_dir, f.name) @@ -402,8 +293,7 @@ def update_resource_thumbnails(request, pk): if form.is_valid(): thumbnail_files = form.cleaned_data["thumbnail_files"] resource.thumbnail_filenames = [f.name for f in thumbnail_files] - if not upload_thumbnails_to_s3(thumbnail_files): - raise Exception("Error uploading files to S3") + upload_files_to_s3(thumbnail_files, "thumbnails") resource.save() return redirect("resources:resource_detail", resource_id=resource.id) |