Implement Multipart handling for generic parameters

Author: C0D3-M4513R

generate.sh

@@ -9,10 +9,13 @@ rm src/apis src/models docs -rf
 --git-user-id=vrchatapi \
 --git-repo-id=vrchatapi-rust \
 -o . \
--i https://raw.githubusercontent.com/vrchatapi/specification/gh-pages/openapi.yaml \
+-i https://raw.githubusercontent.com/vrchatapi/specification/0ec000c2208fcea379372074f42cc6fc97c506d1/openapi.yaml \
 --http-user-agent="vrchatapi-rust"
 #--global-property debugOperations=true
 
+#https://raw.githubusercontent.com/vrchatapi/specification/gh-pages/openapi.yaml \
+
+
 # Update entire description (replace entire line, match the random data there) line in Cargo.toml
 sed -i 's/^description = ".*"/description = "VRChat API Client for Rust"/' Cargo.toml
 
@@ -39,7 +42,10 @@ sed -i 's/Result<models::CurrentUser, Error<GetCurrentUserError>>/Result<models:
 sed -i "s/local_var_req_builder = local_var_req_builder.json(&\(.*\));/if let Some(\1) = \1 { \0 }/g" src/apis/files_api.rs
 
 #https://github.com/vrchatapi/vrchatapi-rust/pull/30
-perl -0pi -e 's|(fn\s+[^(]*\([^)]*)file:\s+:?:?std::path::PathBuf,?([^)]*)((?:(?!\/\/ TODO: support file upload for '\''file'\'' parameter)[\s\S])*)\/\/ TODO: support file upload for '\''file'\'' parameter|\1file: impl Into<::std::borrow::Cow<'\''static, [u8]>>,\n\tfilename: impl Into<::std::borrow::Cow<'\''static, str>>,\n\tmime_type: &str,\2\3let part = reqwest::multipart::Part::bytes(p_form_file).file_name(filename).mime_str(mime_type)?;\n\tmultipart_form = multipart_form.part("file", part);|g' src/apis/files_api.rs
+#perl -0pi -e 's|(fn\s+[^(]*\([^)]*)file:\s+:?:?std::path::PathBuf,?([^)]*)((?:(?!\/\/ TODO: support file upload for '\''file'\'' parameter)[\s\S])*)\/\/ TODO: support file upload for '\''file'\'' parameter|\1file: impl Into<::std::borrow::Cow<'\''static, [u8]>>,\n\tfilename: impl Into<::std::borrow::Cow<'\''static, str>>,\n\tmime_type: &str,\2\3let part = reqwest::multipart::Part::bytes(p_form_file).file_name(filename).mime_str(mime_type)?;\n\tmultipart_form = multipart_form.part("file", part);|g' src/apis/files_api.rs
+#perl -0pi -e 's|(fn\s+[^(]*\([^)]*)image:\s+:?:?std::path::PathBuf,?([^)]*)((?:(?!\/\/ TODO: support file upload for '\''image'\'' parameter)[\s\S])*)\/\/ TODO: support file upload for '\''image'\'' parameter|\1image: impl Into<::std::borrow::Cow<'\''static, [u8]>>,\n\tfilename: impl Into<::std::borrow::Cow<'\''static, str>>,\n\tmime_type: &str,\2\3let part = reqwest::multipart::Part::bytes(p_form_image).file_name(filename).mime_str(mime_type)?;\n\tmultipart_form = multipart_form.part("image", part);|g' src/apis/invite_api.rs
+#This is basically the multipart handling from above, except put in one regex replace
+perl -0pi -e 's|(fn\s+[^(]*\([^)]*)([,\s])([\w]+):\s+(?:::)?std::path::PathBuf,?([^)]*)((?:(?!\/\/ TODO: support file upload for '\''\3'\'' parameter)[\s\S])*)\/\/ TODO: support file upload for '\''\3'\'' parameter|\1\2\3: impl Into<::std::borrow::Cow<'\''static, [u8]>>,\n\tfilename: impl Into<::std::borrow::Cow<'\''static, str>>,\n\tmime_type: &str,\4\5let part = reqwest::multipart::Part::bytes(p_form_\3).file_name(filename).mime_str(mime_type)?;\n\tmultipart_form = multipart_form.part("\3", part);|g' src/apis/files_api.rs src/apis/invite_api.rs
 
 find src/ -type f -name "*.rs" -exec sed -i 's/models::models/models/g' {} +
 

src/apis/invite_api.rs

@@ -323,7 +323,9 @@ pub async fn invite_user(
 pub async fn invite_user_with_photo(
     configuration: &configuration::Configuration,
     user_id: &str,
-    image: std::path::PathBuf,
+    image: impl Into<::std::borrow::Cow<'static, [u8]>>,
+    filename: impl Into<::std::borrow::Cow<'static, str>>,
+    mime_type: &str,
     data: models::InviteRequest,
 ) -> Result<models::SentNotification, Error<InviteUserWithPhotoError>> {
     // add a prefix to parameters to efficiently prevent name collisions
@@ -344,7 +346,10 @@ pub async fn invite_user_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    // TODO: support file upload for 'image' parameter
+    let part = reqwest::multipart::Part::bytes(p_form_image)
+        .file_name(filename)
+        .mime_str(mime_type)?;
+    multipart_form = multipart_form.part("image", part);
     multipart_form = multipart_form.text("data", serde_json::to_string_pretty(&p_form_data)?);
     req_builder = req_builder.multipart(multipart_form);
 
@@ -434,7 +439,9 @@ pub async fn request_invite(
 pub async fn request_invite_with_photo(
     configuration: &configuration::Configuration,
     user_id: &str,
-    image: std::path::PathBuf,
+    image: impl Into<::std::borrow::Cow<'static, [u8]>>,
+    filename: impl Into<::std::borrow::Cow<'static, str>>,
+    mime_type: &str,
     data: models::RequestInviteRequest,
 ) -> Result<models::Notification, Error<RequestInviteWithPhotoError>> {
     // add a prefix to parameters to efficiently prevent name collisions
@@ -455,7 +462,10 @@ pub async fn request_invite_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    // TODO: support file upload for 'image' parameter
+    let part = reqwest::multipart::Part::bytes(p_form_image)
+        .file_name(filename)
+        .mime_str(mime_type)?;
+    multipart_form = multipart_form.part("image", part);
     multipart_form = multipart_form.text("data", serde_json::to_string_pretty(&p_form_data)?);
     req_builder = req_builder.multipart(multipart_form);
 
@@ -601,7 +611,9 @@ pub async fn respond_invite(
 pub async fn respond_invite_with_photo(
     configuration: &configuration::Configuration,
     notification_id: &str,
-    image: std::path::PathBuf,
+    image: impl Into<::std::borrow::Cow<'static, [u8]>>,
+    filename: impl Into<::std::borrow::Cow<'static, str>>,
+    mime_type: &str,
     data: models::InviteResponse,
 ) -> Result<models::Notification, Error<RespondInviteWithPhotoError>> {
     // add a prefix to parameters to efficiently prevent name collisions
@@ -622,7 +634,10 @@ pub async fn respond_invite_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    // TODO: support file upload for 'image' parameter
+    let part = reqwest::multipart::Part::bytes(p_form_image)
+        .file_name(filename)
+        .mime_str(mime_type)?;
+    multipart_form = multipart_form.part("image", part);
     multipart_form = multipart_form.text("data", serde_json::to_string_pretty(&p_form_data)?);
     req_builder = req_builder.multipart(multipart_form);