From 80ba5b561f5ae2b75dfa697a72a3b8fee0decec0 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 19 May 2021 20:26:12 +0200 Subject: [PATCH] codestyle --- src/documents/consumer.py | 5 ++++- src/documents/tests/test_consumer.py | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/documents/consumer.py b/src/documents/consumer.py index b6a77cd9c..39275cee3 100644 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -334,7 +334,10 @@ class Consumer(LoggingMixin): 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)) + 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) diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index b1e0375ed..514c3ca19 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -322,9 +322,11 @@ class TestConsumer(DirectoriesMixin, TestCase): # 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)) + shadow_file = os.path.join(self.dirs.scratch_dir, "._sample.pdf") - shutil.copy(filename, shadowFile) + shutil.copy(filename, shadow_file) + + self.assertTrue(os.path.isfile(shadow_file)) document = self.consumer.try_consume_file(filename) @@ -332,7 +334,7 @@ class TestConsumer(DirectoriesMixin, TestCase): document.source_path )) - self.assertFalse(os.path.isfile(shadowFile)) + self.assertFalse(os.path.isfile(shadow_file)) self.assertFalse(os.path.isfile(filename))