From f6d1478ce798193f11601dabbc48603268783d8a Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 21 Apr 2024 22:32:09 -0400 Subject: [PATCH] no longer read in 'media_file_class' --- .../drain_multipart_request.rs | 30 +++++++++---------- .../upload_engine_asset_media_file_handler.rs | 3 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs index a6c4311b35..d8c7df40ca 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs @@ -16,7 +16,6 @@ pub struct MediaFileUploadData { pub file_name: Option, pub file_bytes: Option, pub media_file_subtype: Option, - pub media_file_class: Option, // Optional: title of the scene (media_files' maybe_title) pub title: Option, @@ -27,7 +26,7 @@ pub async fn drain_multipart_request(mut multipart_payload: Multipart) -> Anyhow let mut uuid_idempotency_token = None; let mut file_bytes = None; let mut file_name = None; - let mut media_file_class = None; + //let mut media_file_class = None; let mut media_file_subtype = None; let mut title = None; @@ -71,19 +70,19 @@ pub async fn drain_multipart_request(mut multipart_payload: Multipart) -> Anyhow anyhow!("Wrong MediaFileSubtype: {:?}", &err) })?; }, - Some("media_file_class") => { - media_file_class = read_multipart_field_as_text(&mut field).await - .map_err(|err| { - warn!("Error reading source: {:?}", &err); - err - })? - .map(|field| MediaFileClass::from_str(&field)) - .transpose() - .map_err(|err| { - warn!("Wrong MediaFileClass: {:?}", &err); - anyhow!("Wrong MediaFileClass: {:?}", &err) - })?; - }, + //Some("media_file_class") => { + // media_file_class = read_multipart_field_as_text(&mut field).await + // .map_err(|err| { + // warn!("Error reading source: {:?}", &err); + // err + // })? + // .map(|field| MediaFileClass::from_str(&field)) + // .transpose() + // .map_err(|err| { + // warn!("Wrong MediaFileClass: {:?}", &err); + // anyhow!("Wrong MediaFileClass: {:?}", &err) + // })?; + //}, Some("title") => { title = read_multipart_field_as_text(&mut field).await .map_err(|e| { @@ -99,7 +98,6 @@ pub async fn drain_multipart_request(mut multipart_payload: Multipart) -> Anyhow uuid_idempotency_token, file_name, file_bytes, - media_file_class, media_file_subtype, title, }) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs index 031e1ef82a..81b687bee0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs @@ -10,6 +10,7 @@ use once_cell::sync::Lazy; use utoipa::ToSchema; use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; +use enums::by_table::media_files::media_file_class::MediaFileClass; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::visibility::Visibility; use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes; @@ -202,7 +203,7 @@ pub async fn upload_engine_asset_media_file_handler( creator_set_visibility, upload_type: UploadType::Filesystem, media_file_type, - maybe_media_class: upload_media_request.media_file_class, + maybe_media_class: Some(MediaFileClass::Dimensional), maybe_media_subtype: upload_media_request.media_file_subtype, maybe_mime_type: Some(mimetype), file_size_bytes: file_size_bytes as u64,