diff --git a/internal/cmd/drive.go b/internal/cmd/drive.go index b9764c9..34c6157 100644 --- a/internal/cmd/drive.go +++ b/internal/cmd/drive.go @@ -1055,13 +1055,11 @@ func guessMimeType(path string) string { func downloadDriveFile(ctx context.Context, svc *drive.Service, meta *drive.File, destPath string, format string) (string, int64, error) { isGoogleDoc := strings.HasPrefix(meta.MimeType, "application/vnd.google-apps.") - normalizedFormat := strings.ToLower(strings.TrimSpace(format)) - if normalizedFormat == "auto" { - normalizedFormat = "" - } + origFormat := format + format = strings.ToLower(strings.TrimSpace(format)) - if !isGoogleDoc && normalizedFormat != "" { - return "", 0, fmt.Errorf("--format %q not supported for non-Google Workspace files (mimeType=%q); file can only be downloaded as-is", format, meta.MimeType) + if !isGoogleDoc && format != "" { + return "", 0, fmt.Errorf("--format %q not supported for non-Google Workspace files (mimeType=%q); file can only be downloaded as-is", origFormat, meta.MimeType) } var ( @@ -1072,11 +1070,11 @@ func downloadDriveFile(ctx context.Context, svc *drive.Service, meta *drive.File if isGoogleDoc { var exportMimeType string - if normalizedFormat == "" { + if format == "" { exportMimeType = driveExportMimeType(meta.MimeType) } else { var mimeErr error - exportMimeType, mimeErr = driveExportMimeTypeForFormat(meta.MimeType, normalizedFormat) + exportMimeType, mimeErr = driveExportMimeTypeForFormat(meta.MimeType, format) if mimeErr != nil { return "", 0, mimeErr } @@ -1140,7 +1138,7 @@ func driveExportMimeType(googleMimeType string) string { func driveExportMimeTypeForFormat(googleMimeType string, format string) (string, error) { format = strings.ToLower(strings.TrimSpace(format)) - if format == "" || format == "auto" { + if format == "" { return driveExportMimeType(googleMimeType), nil } diff --git a/internal/cmd/drive_export_format_test.go b/internal/cmd/drive_export_format_test.go index 280d251..6957dc1 100644 --- a/internal/cmd/drive_export_format_test.go +++ b/internal/cmd/drive_export_format_test.go @@ -28,12 +28,6 @@ func TestDriveExportMimeTypeForFormat(t *testing.T) { format: "", wantMime: "application/pdf", }, - { - name: "doc_auto", - googleMime: "application/vnd.google-apps.document", - format: "auto", - wantMime: "application/pdf", - }, { name: "doc_pdf", googleMime: "application/vnd.google-apps.document", @@ -65,12 +59,6 @@ func TestDriveExportMimeTypeForFormat(t *testing.T) { format: "", wantMime: "text/csv", }, - { - name: "sheet_auto", - googleMime: "application/vnd.google-apps.spreadsheet", - format: "auto", - wantMime: "text/csv", - }, { name: "sheet_pdf", googleMime: "application/vnd.google-apps.spreadsheet",