Support include multiple

docs/usage.md

@@ -137,7 +137,7 @@ These rules perform the following:
 Paperless will check all emails only once and completely ignore messages
 that do not match your filters. It will also only perform the rule action
 on e-mails that it has consumed documents from. The filename attachment
-exclusion pattern can include multiple patterns separated by a comma.
+patterns can include wildcards and multiple patterns separated by a comma.
 
 The actions all ensure that the same mail is not consumed twice by
 different means. These are as follows:

src-ui/messages.xlf

@@ -3752,22 +3752,19 @@
           <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8772833173536287413" datatype="html">
+      <trans-unit id="7233407036155150477" datatype="html">
-        <source>Optional. Wildcards e.g. *.pdf or *invoice* allowed. Case insensitive.</source>
+        <source>Optional. Wildcards e.g. *.pdf or *invoice* allowed. Can be comma-separated list. Case insensitive.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html</context>
           <context context-type="linenumber">43</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="1546332577833742677" datatype="html">
-        <source>Exclude files matching</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html</context>
           <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7233407036155150477" datatype="html">
+      <trans-unit id="1546332577833742677" datatype="html">
-        <source>Optional. Wildcards e.g. *.pdf or *invoice* allowed. Can be comma-separated list. Case insensitive.</source>
+        <source>Exclude files matching</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html</context>
           <context context-type="linenumber">44</context>

src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html

@@ -40,7 +40,7 @@
         <pngx-input-select [horizontal]="true" i18n-title title="Attachment type" [items]="attachmentTypeOptions" formControlName="attachment_type"></pngx-input-select>
       </div>
       <div class="col-md-6">
-        <pngx-input-text [horizontal]="true" i18n-title title="Include only files matching" formControlName="filter_attachment_filename_include" i18n-hint hint="Optional. Wildcards e.g. *.pdf or *invoice* allowed. Case insensitive." [error]="error?.filter_attachment_filename_include"></pngx-input-text>
+        <pngx-input-text [horizontal]="true" i18n-title title="Include only files matching" formControlName="filter_attachment_filename_include" i18n-hint hint="Optional. Wildcards e.g. *.pdf or *invoice* allowed. Can be comma-separated list. Case insensitive." [error]="error?.filter_attachment_filename_include"></pngx-input-text>
         <pngx-input-text [horizontal]="true" i18n-title title="Exclude files matching" formControlName="filter_attachment_filename_exclude" i18n-hint hint="Optional. Wildcards e.g. *.pdf or *invoice* allowed. Can be comma-separated list. Case insensitive." [error]="error?.filter_attachment_filename_exclude"></pngx-input-text>
       </div>
     </div>

src/paperless_mail/mail.py

@@ -686,6 +686,25 @@ class MailAccountHandler(LoggingMixin):
 
         return processed_elements
 
+    def filename_inclusion_matches(
+        self,
+        filter_attachment_filename_include: Optional[str],
+        filename: str,
+    ) -> bool:
+        if filter_attachment_filename_include:
+            filter_attachment_filename_inclusions = (
+                filter_attachment_filename_include.split(",")
+            )
+
+            # Force the filename and pattern to the lowercase
+            # as this is system dependent otherwise
+            filename = filename.lower()
+            for filename_include in filter_attachment_filename_inclusions:
+                if filename_include and fnmatch(filename, filename_include.lower()):
+                    return True
+            return False
+        return True
+
     def filename_exclusion_matches(
         self,
         filter_attachment_filename_exclude: Optional[str],
@@ -728,9 +747,9 @@ class MailAccountHandler(LoggingMixin):
                 )
                 continue
 
-            if rule.filter_attachment_filename_include and not fnmatch(
+            if not self.filename_inclusion_matches(
-                att.filename.lower(),
+                rule.filter_attachment_filename_include,
-                rule.filter_attachment_filename_include.lower(),
+                att.filename,
             ):
                 # Force the filename and pattern to the lowercase
                 # as this is system dependent otherwise

src/paperless_mail/tests/test_mail.py

@@ -658,6 +658,12 @@ class TestMail(
                 exclude_pattern=None,
                 expected_matches=["f2.png"],
             ),
+            FilterTestCase(
+                "PDF Files with f2 and f3",
+                include_pattern="f2.pdf,f3*",
+                exclude_pattern=None,
+                expected_matches=["f2.pdf", "f3.pdf"],
+            ),
             FilterTestCase(
                 "PDF Files without f1",
                 include_pattern="*.pdf",