delete macOS specific files

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 8c888259f105f5f527256ac5e359db4fdce70bc1..b6a77cd9c7247bfabc9fb9760f2d55fcd271eb8f 100644 (file)
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -333,6 +333,12 @@ class Consumer(LoggingMixin):
                 self.log("debug", "Deleting file {}".format(self.path))
                 os.unlink(self.path)
 
+                # https://github.com/jonaswinkler/paperless-ng/discussions/1037
+                shadow_file = os.path.join(os.path.dirname(self.path), "._" + os.path.basename(self.path))
+                if os.path.isfile(shadow_file):
+                    self.log("debug", "Deleting file {}".format(shadow_file))
+                    os.unlink(shadow_file)
+
         except Exception as e:
             self._fail(
                 str(e),

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 44effd39ee4d237e70f5126d215b2b06c7b505ef..b1e0375ed2f78864cb15579b80bb36acf8dfcc62 100644 (file)
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -317,6 +317,25 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress()
 
+    @override_settings(PAPERLESS_FILENAME_FORMAT=None)
+    def testDeleteMacFiles(self):
+        # https://github.com/jonaswinkler/paperless-ng/discussions/1037
+
+        filename = self.get_test_file()
+        shadowFile = os.path.join(os.path.dirname(filename), "._" + os.path.basename(filename))
+
+        shutil.copy(filename, shadowFile)
+
+        document = self.consumer.try_consume_file(filename)
+
+        self.assertTrue(os.path.isfile(
+            document.source_path
+        ))
+
+        self.assertFalse(os.path.isfile(shadowFile))
+        self.assertFalse(os.path.isfile(filename))
+
+
     def testOverrideFilename(self):
         filename = self.get_test_file()
         override_filename = "Statement for November.pdf"