feat: add --upload-content-type flag and smart MIME inference for uploads#429
Conversation
…oads The multipart upload media Content-Type is now resolved independently from the metadata mimeType, enabling Drive import conversions (e.g. Markdown → Google Docs) to work automatically. Priority order for the media MIME type: 1. --upload-content-type flag (explicit override) 2. File extension inference (best guess for what the bytes are) 3. Metadata mimeType (backward-compat fallback) 4. application/octet-stream Previously the metadata mimeType was reused for the media part, which meant uploading `notes.md` with mimeType set to `application/vnd.google-apps.document` would incorrectly label the bytes as a Google Doc instead of text/markdown. Made-with: Cursor
🦋 Changeset detectedLatest commit: a4bfb58 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
googleworkspace-bot
added
area: http
area: core
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request significantly enhances the file upload functionality by introducing a dedicated flag for specifying the media's content type and implementing intelligent MIME type inference. These changes streamline the process of uploading files to services like Google Drive, particularly for scenarios requiring automatic format conversions, by ensuring the correct content type is communicated for the actual file bytes, independent of the target metadata type. Highlights
Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a valuable feature for file uploads by adding the --upload-content-type flag and intelligent MIME type inference. The implementation is clean and well-tested, and the separation of concerns in resolve_upload_mime is good. I have one suggestion to improve the robustness of the file extension detection logic to better handle common edge cases like dotfiles.
|
Related to #380 ? |
Absolutely! This was actually my initial reason to look into the issue. When checking if it was already tackled, I admit that I mostly looked into the list of MRs and branches to make sure I was not duplicating effort and I missed the open issue. It feels that my fix would solve the issue with the auto-detection suggested in #380 and keeping the cli as a thin transport layer. But I am happy to be guided in another direction 🙏. |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #429 +/- ##
==========================================
+ Coverage 64.40% 64.44% +0.04%
==========================================
Files 38 38
Lines 15584 15698 +114
==========================================
+ Hits 10037 10117 +80
- Misses 5547 5581 +34 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
🙏 |
…lder Replace custom MessageBuilder, RFC 2047 encoding, header sanitization, and address encoding (including googleworkspace#482) with the mail-builder crate (Stalwart Labs, 0 runtime deps). Each command builds a mail_builder::MessageBuilder directly. Introduce structured types throughout: - Mailbox type (parsed display name + email) replaces raw string passing - sanitize_control_chars strips ASCII control characters (CRLF, null, tab, etc.) at the parse boundary — defense-in-depth for mail-builder's structured header types, superseding sanitize_header_value, sanitize_component, and encode_address_header from googleworkspace#482 - OriginalMessage fields use Option<T> instead of empty-string sentinels - parse_original_message returns Result with validation (threadId, From, Message-ID) - Pre-parsed Config types (SendConfig, ForwardConfig, ReplyConfig) with Vec<Mailbox> — parse at the boundary, not downstream - parse_forward_args and parse_send_args return Result with --to validation, consistent with parse_reply_args - parse_optional_mailboxes helper normalizes Some(vec![]) to None for optional address fields (--cc, --bcc, --from) - Envelope types borrow from Config + OriginalMessage with lifetimes - Message IDs stored bare (no angle brackets), parsed once at boundary - References stored as Vec<String> instead of space-separated string - ThreadingHeaders bundles In-Reply-To + References with debug_assert for bare-ID convention - Shared CLI arg builders (common_mail_args, common_reply_args) eliminate duplicated --cc/--bcc/--html/--dry-run definitions Additional improvements: - finalize_message returns Result instead of panicking via .expect() - Mailbox::parse_list filters empty-email entries (trailing comma edge case) - format_email_link percent-encodes mailto hrefs to prevent parameter injection - Forward date handling: omits Date line when absent instead of showing empty "Date: " - Dry-run auth: log skipped auth as diagnostic instead of silently discarding errors - Restore --html tips in after_help strings (gmail_quote CSS, cid: image warnings, HTML fragment advice) lost in release PR googleworkspace#434 - Update execute_method call for upload_content_type parameter (googleworkspace#429) Delete: MessageBuilder, encode_header_value, sanitize_header_value, encode_address_header, sanitize_component, extract_email, extract_display_name, split_mailbox_list, build_references.
4 participants
Summary
--upload-content-typeflag for multipart uploads, allowing the mediaContent-Typeto be set independently from the metadatamimeType.md→text/markdown) when the flag is omitted, so Drive import conversions work automaticallymimeTypeonly for unrecognized extensions, preserving backward compatibilityPreviously, uploading
notes.mdwith"mimeType":"application/vnd.google-apps.document"would label the media bytes as a Google Doc. Now the media part correctly getstext/markdown, and Drive performs the Markdown → Google Docs conversion.Test plan
cargo test— 556 tests pass (7 new tests forresolve_upload_mime)cargo clippy -- -D warnings— cleanMade with Cursor