From e298d30f8d4d7e765cb09be5d475091b3f55b5ee Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 26 Mar 2024 02:22:31 -0400 Subject: [PATCH] move upload endpoints (as we're adding a lot more to go fast) --- .../endpoints/engine/process_upload_media_file.rs | 4 ++-- .../src/http_server/endpoints/media_files/mod.rs | 4 +--- .../endpoints/media_files/upload/mod.rs | 7 +++---- .../upload_engine_asset/drain_multipart_request.rs | 0 .../{ => upload}/upload_engine_asset/mod.rs | 0 .../upload_engine_asset_media_file_handler.rs | 5 ++--- .../upload_engine_asset/upload_error.rs | 0 .../drain_multipart_request.rs | 0 .../media_files/upload/upload_generic/mod.rs | 4 ++++ .../process_upload_media_file.rs | 4 ++-- .../upload/{ => upload_generic}/upload_error.rs | 0 .../upload_media_file_handler.rs | 4 ++-- .../upload_video/drain_multipart_request.rs | 0 .../media_files/{ => upload}/upload_video/mod.rs | 0 .../{ => upload}/upload_video/upload_error.rs | 0 .../upload_video_media_file_handler.rs | 6 +++--- .../src/routes/media_files_routes.rs | 14 +++++++++++--- 17 files changed, 30 insertions(+), 22 deletions(-) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_engine_asset/drain_multipart_request.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_engine_asset/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_engine_asset/upload_engine_asset_media_file_handler.rs (96%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_engine_asset/upload_error.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/{ => upload_generic}/drain_multipart_request.rs (100%) create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/mod.rs rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/{ => upload_generic}/process_upload_media_file.rs (98%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/{ => upload_generic}/upload_error.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/{ => upload_generic}/upload_media_file_handler.rs (90%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_video/drain_multipart_request.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_video/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_video/upload_error.rs (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/media_files/{ => upload}/upload_video/upload_video_media_file_handler.rs (96%) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/engine/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/engine/process_upload_media_file.rs index 6e430108d9..18a7148173 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/engine/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/engine/process_upload_media_file.rs @@ -17,8 +17,8 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; use tokens::tokens::media_files::MediaFileToken; -use crate::http_server::endpoints::media_files::upload::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; +use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; +use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError; use crate::server_state::ServerState; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs index 671db1dad0..488fce973c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs @@ -5,6 +5,4 @@ pub mod get_media_file; pub mod list; pub mod rename_media_file_handler; pub mod update_media_file; -pub mod upload; -pub mod upload_engine_asset; -pub mod upload_video; \ No newline at end of file +pub mod upload; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/mod.rs index 8144df2cb4..ae21f138a3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/mod.rs @@ -1,4 +1,3 @@ -pub mod drain_multipart_request; -pub mod process_upload_media_file; -pub mod upload_error; -pub mod upload_media_file_handler; +pub mod upload_engine_asset; +pub mod upload_generic; +pub mod upload_video; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/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 similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/drain_multipart_request.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/drain_multipart_request.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/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 similarity index 96% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/upload_engine_asset_media_file_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs index b536b7c28e..59e19a3e7c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/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 @@ -21,9 +21,8 @@ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upl use tokens::tokens::media_files::MediaFileToken; use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::media_files::upload::drain_multipart_request::MediaFileUploadSource; -use crate::http_server::endpoints::media_files::upload_engine_asset::drain_multipart_request::drain_multipart_request; -use crate::http_server::endpoints::media_files::upload_engine_asset::upload_error::EngineAssetMediaFileUploadError; +use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request; +use crate::http_server::endpoints::media_files::upload::upload_engine_asset::upload_error::EngineAssetMediaFileUploadError; use crate::server_state::ServerState; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/upload_error.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_error.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_engine_asset/upload_error.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_error.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/drain_multipart_request.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/drain_multipart_request.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/mod.rs new file mode 100644 index 0000000000..8144df2cb4 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/mod.rs @@ -0,0 +1,4 @@ +pub mod drain_multipart_request; +pub mod process_upload_media_file; +pub mod upload_error; +pub mod upload_media_file_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs similarity index 98% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/process_upload_media_file.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs index 0938e242cb..3cdcb58708 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs @@ -17,8 +17,8 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; use tokens::tokens::media_files::MediaFileToken; -use crate::http_server::endpoints::media_files::upload::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; +use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource}; +use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError; use crate::server_state::ServerState; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_error.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_error.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_error.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_error.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs similarity index 90% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_media_file_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs index 26a65a9f76..8f44f05deb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs @@ -8,8 +8,8 @@ use utoipa::ToSchema; use tokens::tokens::media_files::MediaFileToken; -use crate::http_server::endpoints::media_files::upload::process_upload_media_file::process_upload_media_file; -use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError; +use crate::http_server::endpoints::media_files::upload::upload_generic::process_upload_media_file::process_upload_media_file; +use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError; use crate::server_state::ServerState; #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/drain_multipart_request.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/drain_multipart_request.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/drain_multipart_request.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/upload_error.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_error.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/upload_error.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_error.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/upload_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs similarity index 96% rename from crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/upload_video_media_file_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs index c34b78dad3..a1df98c7b5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload_video/upload_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs @@ -21,9 +21,9 @@ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upl use tokens::tokens::media_files::MediaFileToken; use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; -use crate::http_server::endpoints::media_files::upload_video::drain_multipart_request::drain_multipart_request; -use crate::http_server::endpoints::media_files::upload_video::drain_multipart_request::MediaFileUploadSource; -use crate::http_server::endpoints::media_files::upload_video::upload_error::VideoMediaFileUploadError; +use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::MediaFileUploadSource; +use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::drain_multipart_request; +use crate::http_server::endpoints::media_files::upload::upload_video::upload_error::VideoMediaFileUploadError; use crate::server_state::ServerState; use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format; diff --git a/crates/service/web/storyteller_web/src/routes/media_files_routes.rs b/crates/service/web/storyteller_web/src/routes/media_files_routes.rs index 76fd9929c3..d3c17e3251 100644 --- a/crates/service/web/storyteller_web/src/routes/media_files_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/media_files_routes.rs @@ -13,9 +13,9 @@ use crate::http_server::endpoints::media_files::list::list_media_files_by_batch_ use crate::http_server::endpoints::media_files::list::list_media_files_for_user::list_media_files_for_user_handler; use crate::http_server::endpoints::media_files::rename_media_file_handler::rename_media_file_handler; use crate::http_server::endpoints::media_files::update_media_file::update_media_file_handler; -use crate::http_server::endpoints::media_files::upload::upload_media_file_handler::upload_media_file_handler; -use crate::http_server::endpoints::media_files::upload_engine_asset::upload_engine_asset_media_file_handler::upload_engine_asset_media_file_handler; -use crate::http_server::endpoints::media_files::upload_video::upload_video_media_file_handler::upload_video_media_file_handler; +use crate::http_server::endpoints::media_files::upload::upload_generic::upload_media_file_handler::upload_media_file_handler; +use crate::http_server::endpoints::media_files::upload::upload_engine_asset::upload_engine_asset_media_file_handler::upload_engine_asset_media_file_handler; +use crate::http_server::endpoints::media_files::upload::upload_video::upload_video_media_file_handler::upload_video_media_file_handler; pub fn add_media_file_routes (app: App) -> App where @@ -75,5 +75,13 @@ pub fn add_media_file_routes (app: App) -> App .route(web::post().to(upload_engine_asset_media_file_handler)) .route(web::head().to(|| HttpResponse::Ok())) ) +// .service(web::resource("/write/engine_asset") +// .route(web::post().to(/* todo */)) +// .route(web::head().to(|| HttpResponse::Ok())) +// ) +// .service(web::resource("/write/scene_file") +// .route(web::post().to(/* todo */)) +// .route(web::head().to(|| HttpResponse::Ok())) +// ) ) }