Merge pull request #3105 from dcava/dev

This commit is contained in:
shamoon 2023-04-18 21:02:11 -07:00 committed by GitHub
commit bf1e49fc4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 17 deletions

View File

@ -271,25 +271,11 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
"ignore": False, "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, "ignore": True,
}, },
{ {
"path": os.path.join( "path": os.path.join(self.dirs.consumption_dir, ".DS_Store"),
self.dirs.consumption_dir,
"foo",
".DS_STORE",
"bar.pdf",
),
"ignore": True,
},
{
"path": os.path.join(
self.dirs.consumption_dir,
".DS_STORE",
"foo",
"bar.pdf",
),
"ignore": True, "ignore": True,
}, },
{ {

View File

@ -710,7 +710,7 @@ CONSUMER_IGNORE_PATTERNS = list(
json.loads( json.loads(
os.getenv( os.getenv(
"PAPERLESS_CONSUMER_IGNORE_PATTERNS", "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
), ),
), ),
) )