fix size calc

wxiaoguang · wxiaoguang · commit 8f40b9f97f42 · 2025-03-05T10:29:29.000+08:00
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
@@ -131,7 +131,6 @@ func (b64embedder *mailAttachmentBase64Embedder) AttachmentSrcToBase64DataURI(ct
 	if attachment.Size+b64embedder.estimateSize > b64embedder.maxSize {
 		return "", fmt.Errorf("total embedded images exceed max limit")
 	}
-	b64embedder.estimateSize += attachment.Size
 
 	fr, err := storage.Attachments.Open(attachment.RelativePath())
 	if err != nil {
@@ -152,6 +151,7 @@ func (b64embedder *mailAttachmentBase64Embedder) AttachmentSrcToBase64DataURI(ct
 
 	encoded := base64.StdEncoding.EncodeToString(content)
 	dataURI := fmt.Sprintf("data:%s;base64,%s", mimeType.GetMimeType(), encoded)
+	b64embedder.estimateSize += int64(len(dataURI))
 	return dataURI, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ func (b64embedder *mailAttachmentBase64Embedder) AttachmentSrcToBase64DataURI(ct`
`131`	`131`	`if attachment.Size+b64embedder.estimateSize > b64embedder.maxSize {`
`132`	`132`	`return "", fmt.Errorf("total embedded images exceed max limit")`
`133`	`133`	`}`
`134`		`- b64embedder.estimateSize += attachment.Size`
`135`	`134`
`136`	`135`	`fr, err := storage.Attachments.Open(attachment.RelativePath())`
`137`	`136`	`if err != nil {`
`@@ -152,6 +151,7 @@ func (b64embedder *mailAttachmentBase64Embedder) AttachmentSrcToBase64DataURI(ct`
`152`	`151`
`153`	`152`	`encoded := base64.StdEncoding.EncodeToString(content)`
`154`	`153`	`dataURI := fmt.Sprintf("data:%s;base64,%s", mimeType.GetMimeType(), encoded)`
	`154`	`+ b64embedder.estimateSize += int64(len(dataURI))`
`155`	`155`	`return dataURI, nil`
`156`	`156`	`}`
`157`	`157`