codinux
/
eInvoicing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reading a message part's media type only once

This commit is contained in:
dankito 2024-11-21 20:28:14 +01:00
parent 6b82636fdd
commit 399581da78
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
e-invoicing-domain/src/main/kotlin/net/codinux/invoicing/mail/MailReader.kt
View File

@ -23,6 +23,12 @@ class MailReader(
private val eInvoiceReader: EInvoiceReader = EInvoiceReader() private val eInvoiceReader: EInvoiceReader = EInvoiceReader()
) { ) {
private data class MessagePart(
val mediaType: String,
val part: Part
)
private val mailDispatcher = Executors.newCachedThreadPool().asCoroutineDispatcher() private val mailDispatcher = Executors.newCachedThreadPool().asCoroutineDispatcher()
private val log by logger() private val log by logger()
@ -116,9 +122,7 @@ class MailReader(
return null return null
} }
private fun getAllMessageParts(part: Part): List<Part> { private fun getAllMessageParts(part: Part): List<MessagePart> {
contentClasses.add(part.content?.let { it::class })
return if (part.isMimeType("multipart/*")) { return if (part.isMimeType("multipart/*")) {
val multipart = part.content as Multipart val multipart = part.content as Multipart
val parts = IntRange(0, multipart.count - 1).map { multipart.getBodyPart(it) } val parts = IntRange(0, multipart.count - 1).map { multipart.getBodyPart(it) }
@ -127,15 +131,20 @@ class MailReader(
getAllMessageParts(subPart) getAllMessageParts(subPart)
} }
} else { } else {
listOf(part) val mediaType = getMediaType(part)
if (mediaType == null) {
log.warn { "Could not determine media type of message part $part" }
emptyList()
} else {
listOf(MessagePart(mediaType, part))
}
} }
} }
private fun findEInvoice(part: Part): MailAttachmentWithEInvoice? { private fun findEInvoice(messagePart: MessagePart): MailAttachmentWithEInvoice? {
try { try {
if (Part.ATTACHMENT.equals(part.disposition, true)) { // TODO: what about Part.INLINE? val part = messagePart.part
val mediaType = getMediaType(part)?.lowercase() val invoice = tryToReadEInvoice(part, messagePart.mediaType)
val invoice = tryToReadEInvoice(part, mediaType)
if (invoice != null) { if (invoice != null) {
val filename = File(part.fileName) val filename = File(part.fileName)
@ -144,11 +153,10 @@ class MailReader(
file.deleteOnExit() file.deleteOnExit()
} }
return MailAttachmentWithEInvoice(part.fileName, mediaType, invoice, file) return MailAttachmentWithEInvoice(part.fileName, messagePart.mediaType, invoice, file)
}
} }
} catch (e: Throwable) { } catch (e: Throwable) {
log.error(e) { "Could not check attachment '${part.fileName}' for eInvoice" } log.error(e) { "Could not check attachment '${messagePart.part.fileName}' (${messagePart.mediaType}) for eInvoice" }
} }
return null return null