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

Downloading eInvoice files only once

This commit is contained in:
dankito 2024-11-26 04:12:14 +01:00
parent 4dc9b43189
commit 4aefa86ab9
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
View File

@ -149,17 +149,14 @@ open class EmailsFetcher(
val filename = File(part.fileName) val filename = File(part.fileName)
val extension = filename.extension val extension = filename.extension
val invoice = tryToReadEInvoice(part, extension, messagePart.mediaType, status) val invoiceAndFile = tryToReadEInvoice(part, extension, messagePart.mediaType, status)
if (invoice != null || Part.ATTACHMENT.equals(part.description, ignoreCase = true)) { if (invoiceAndFile != null || Part.ATTACHMENT.equals(part.disposition, ignoreCase = true)) {
val file = if (extension !in status.options.downloadAttachmentsWithExtensions) null val file = invoiceAndFile?.second ?:
else { if (extension !in status.options.downloadAttachmentsWithExtensions) null
File(status.options.attachmentsDownloadDirectory, part.fileName).also { file -> else downloadAttachment(part, status)
part.inputStream.use { it.copyTo(file.outputStream()) }
}
}
return EmailAttachment(part.fileName, messagePart.mediaType, invoice, file) return EmailAttachment(part.fileName, messagePart.mediaType, invoiceAndFile?.first, file)
} }
} catch (e: Throwable) { } catch (e: Throwable) {
log.error(e) { "Could not check attachment '${messagePart.part.fileName}' (${messagePart.mediaType}) for eInvoice" } log.error(e) { "Could not check attachment '${messagePart.part.fileName}' (${messagePart.mediaType}) for eInvoice" }
@ -169,11 +166,18 @@ open class EmailsFetcher(
return null return null
} }
protected open fun tryToReadEInvoice(part: Part, extension: String, mediaType: String?, status: FetchEmailsStatus): Invoice? = try { private fun downloadAttachment(part: Part, status: FetchEmailsStatus) =
File(status.options.attachmentsDownloadDirectory, part.fileName).also { file ->
part.inputStream.use { it.copyTo(file.outputStream()) }
}
protected open fun tryToReadEInvoice(part: Part, extension: String, mediaType: String?, status: FetchEmailsStatus): Pair<Invoice, File>? = try {
if (extension == "pdf" || mediaType == "application/pdf" || mediaType == "application/octet-stream") { if (extension == "pdf" || mediaType == "application/pdf" || mediaType == "application/octet-stream") {
eInvoiceReader.extractFromPdf(part.inputStream) val file = downloadAttachment(part, status)
Pair(eInvoiceReader.extractFromPdf(part.inputStream), file)
} else if (extension == "xml" || mediaType == "application/xml" || mediaType == "text/xml") { } else if (extension == "xml" || mediaType == "application/xml" || mediaType == "text/xml") {
eInvoiceReader.extractFromXml(part.inputStream) val file = downloadAttachment(part, status)
Pair(eInvoiceReader.extractFromXml(part.inputStream), file)
} else { } else {
null null
} }