From 22bb28db625eed70067eec542ae09cd5a8e527c6 Mon Sep 17 00:00:00 2001 From: David Cavallucci Date: Sun, 16 Apr 2023 21:18:17 +1000 Subject: [PATCH 1/2] Changed consumer ignore files pattern for .DS_STORE, .DS_Store --- src/paperless/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index b8abea5ff..3b748672f 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -710,7 +710,7 @@ CONSUMER_IGNORE_PATTERNS = list( json.loads( os.getenv( "PAPERLESS_CONSUMER_IGNORE_PATTERNS", - '[".DS_STORE/*", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*"]', # noqa: E501 + '[".DS_Store", ".DS_STORE", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*"]', # noqa: E501 ), ), ) From d1984c0ddadac1cf1def1f55da8f527806ee6fea Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:09:24 -0700 Subject: [PATCH 2/2] Update testing for ignore macOS directory services file --- .../tests/test_management_consumer.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py index 150880116..1230288c5 100644 --- a/src/documents/tests/test_management_consumer.py +++ b/src/documents/tests/test_management_consumer.py @@ -271,25 +271,11 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase): "ignore": False, }, { - "path": os.path.join(self.dirs.consumption_dir, ".DS_STORE", "foo.pdf"), + "path": os.path.join(self.dirs.consumption_dir, ".DS_STORE"), "ignore": True, }, { - "path": os.path.join( - self.dirs.consumption_dir, - "foo", - ".DS_STORE", - "bar.pdf", - ), - "ignore": True, - }, - { - "path": os.path.join( - self.dirs.consumption_dir, - ".DS_STORE", - "foo", - "bar.pdf", - ), + "path": os.path.join(self.dirs.consumption_dir, ".DS_Store"), "ignore": True, }, {