mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-04-09 09:58:20 -05:00
Merge pull request #3105 from dcava/dev
This commit is contained in:
commit
bf1e49fc4c
@ -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,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user