Improved logging of MailReader

horstoeko · Oct 9, 2024 · 1c506dd · 1c506dd
1 parent eafff11
commit 1c506dd
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/ZugferdMailReader.php b/src/ZugferdMailReader.php
@@ -175,20 +175,24 @@ function (Attachment $attachment) use ($account, $folder, $message) {
      */
     protected function checkSingleMessageAttachment(ZugferdMailAccount $account, Folder $folder, Message $message, Attachment $attachment): void
     {
-        if (!in_array($attachment->getMimeType(), $account->getMimeTypesToWatch())) {
-            return;
-        }
-
         $messageAdditionalData = [
             "account" => $account,
             "folder" => $folder,
             "message" => $message,
             "attachment" => $attachment,
         ];
 
-        $document = null;
+        $this->addLogMessageToMessageBag(sprintf("Checking attachment of mail %s, Subject: %s, Sender: %s", $message->getUid(), $message->getSubject(), $message->getFrom()));
 
-        $this->addLogMessageToMessageBag(sprintf("Checking mail %s, Subject: %s, Sender: %s", $message->getUid(), $message->getSubject(), $message->getFrom()));
+        if (!in_array($attachment->getMimeType(), $account->getMimeTypesToWatch())) {
+            $this->addLogMessageToMessageBag(sprintf("Mimetype %s does not match", $attachment->getMimeType()));
+            $this->addLogMessageToMessageBag('');
+            return;
+        }
+
+        $this->addLogMessageToMessageBag(sprintf("Valid Mimetype %s found", $attachment->getMimeType()));
+
+        $document = null;
 
         if (is_null($document)) {
             try {