fix(cp): avoid guessed content type for multipart uploads

Author: overtrue

crates/cli/src/commands/cp.rs

@@ -277,12 +277,6 @@ async fn upload_file(
         return ExitCode::Success;
     }
 
-    // Determine content type
-    let guessed_type: Option<String> = mime_guess::from_path(src)
-        .first()
-        .map(|m| m.essence_str().to_string());
-    let content_type = args.content_type.as_deref().or(guessed_type.as_deref());
-
     // Get file size for progress bar decision
     let file_size = match std::fs::metadata(src) {
         Ok(m) => m.len(),
@@ -294,6 +288,16 @@ async fn upload_file(
         }
     };
 
+    // Determine content type
+    let guessed_type: Option<String> = mime_guess::from_path(src)
+        .first()
+        .map(|m| m.essence_str().to_string());
+    let content_type = select_upload_content_type(
+        args.content_type.as_deref(),
+        guessed_type.as_deref(),
+        file_size,
+    );
+
     // Show progress bar for large files
     let progress = if file_size >= MULTIPART_THRESHOLD {
         tracing::debug!(
@@ -335,6 +339,18 @@ async fn upload_file(
     }
 }
 
+fn select_upload_content_type<'a>(
+    explicit_type: Option<&'a str>,
+    guessed_type: Option<&'a str>,
+    file_size: u64,
+) -> Option<&'a str> {
+    if file_size > MULTIPART_THRESHOLD {
+        explicit_type
+    } else {
+        explicit_type.or(guessed_type)
+    }
+}
+
 async fn upload_directory(
     client: &S3Client,
     src: &Path,
@@ -862,6 +878,33 @@ mod tests {
         assert!(!progress.is_visible());
     }
 
+    #[test]
+    fn test_select_upload_content_type_uses_guess_for_small_files() {
+        let selected =
+            select_upload_content_type(None, Some("text/plain"), MULTIPART_THRESHOLD - 1);
+
+        assert_eq!(selected, Some("text/plain"));
+    }
+
+    #[test]
+    fn test_select_upload_content_type_skips_guess_for_multipart_files() {
+        let selected =
+            select_upload_content_type(None, Some("text/plain"), MULTIPART_THRESHOLD + 1);
+
+        assert_eq!(selected, None);
+    }
+
+    #[test]
+    fn test_select_upload_content_type_keeps_explicit_type_for_multipart_files() {
+        let selected = select_upload_content_type(
+            Some("application/octet-stream"),
+            Some("text/plain"),
+            MULTIPART_THRESHOLD + 1,
+        );
+
+        assert_eq!(selected, Some("application/octet-stream"));
+    }
+
     #[test]
     fn test_parse_cp_path_prefers_existing_local_path_when_alias_missing() {
         let (alias_manager, temp_dir) = temp_alias_manager();