Interfaces: Extract attachments from stream

Modules.Interfaces/ZUGFeRDInterface.vb

@@ -67,6 +67,16 @@ Public Class ZUGFeRDInterface
         Return SerializeZUGFeRDDocument(oXmlDocument)
     End Function
 
+    Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As CrossIndustryDocumentType
+        Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Stream)
+
+        If IsNothing(oXmlDocument) Then
+            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
+        End If
+
+        Return SerializeZUGFeRDDocument(oXmlDocument)
+    End Function
+
     Public Function ValidateZUGFeRDFile(Path As String) As XPathDocument
         Dim oProcessOutput, oProcessError As String
         Dim oXmlDocument As XPathDocument
@@ -111,26 +121,47 @@ Public Class ZUGFeRDInterface
         Return oXmlDocument
     End Function
 
+    Public Function ValidateZUGFeRDFileWithGDPicture(Stream As Stream) As XPathDocument
+        Dim oAttachmentExtractor = New PDFAttachments(_logConfig)
+        Dim oAllowedExtensions = New List(Of String) From {"xml"}
+
+        Try
+            Dim oResults = oAttachmentExtractor.Extract(Stream, oAllowedExtensions)
+            Return HandleAttachments(oResults)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
     Public Function ValidateZUGFeRDFileWithGDPicture(Path As String) As XPathDocument
         Dim oAttachmentExtractor = New PDFAttachments(_logConfig)
         Dim oAllowedExtensions = New List(Of String) From {"xml"}
-        Dim oXmlDocument As XPathDocument
 
         Try
             Dim oResults = oAttachmentExtractor.Extract(Path, oAllowedExtensions)
+            Return HandleAttachments(oResults)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
 
-            If oResults Is Nothing Then
+    Private Function HandleAttachments(Results As List(Of PDFAttachments.AttachmentResult)) As XPathDocument
+        Dim oXmlDocument As XPathDocument
+
+        If Results Is Nothing Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
         End If
 
-            If oResults.Count = 0 Then
+        If Results.Count = 0 Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
         End If
 
         Dim oFound As Boolean = False
         Dim oFoundResult As PDFAttachments.AttachmentResult = Nothing
 
-            For Each oResult In oResults
+        For Each oResult In Results
             If oResult.FileName.ToUpper() = PDFAttachments.ZUGFERD_XML_FILENAME.ToUpper() Then
                 oFound = True
                 oFoundResult = oResult
@@ -151,10 +182,6 @@ Public Class ZUGFeRDInterface
             _logger.Error(ex)
             Throw ex
         End Try
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
     End Function
 
     Public Function SerializeZUGFeRDDocument(Document As XPathDocument) As CrossIndustryDocumentType