Skip to content

Commit 0297b40

Browse files
authored
Ignore the "__MACOSX" macOS metadata folder dejacode#229 (#1558)
aboutcode-org/dejacode#229 Signed-off-by: tdruez <tdruez@nexb.com>
1 parent ec2ca28 commit 0297b40

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

scanpipe/pipes/flag.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
"*/scancode-config.yml",
7373
"policies.yml", # when located in the root dir
7474
"*/policies.yml",
75+
"*/__MACOSX*", # macOS metadata folder
7576
]
7677

7778

scanpipe/tests/pipes/test_flag.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from scanpipe.models import CodebaseResource
2727
from scanpipe.models import Project
2828
from scanpipe.pipes import flag
29+
from scanpipe.tests import make_project
2930
from scanpipe.tests import make_resource_file
3031

3132

@@ -89,6 +90,20 @@ def test_scanpipe_pipes_flag_flag_ignored_patterns(self):
8990
)
9091
self.assertEqual(3, updated)
9192

93+
project2 = make_project()
94+
make_resource_file(project2, "a.cdx.json.zip-extract")
95+
r1 = make_resource_file(project2, "a.cdx.json.zip-extract/__MACOSX")
96+
r2 = make_resource_file(
97+
project2, "a.cdx.json.zip-extract/__MACOSX/._a.cdx.json"
98+
)
99+
make_resource_file(project2, "a.cdx.json.zip-extract/a.cdx.json")
100+
updated = flag.flag_ignored_patterns(project2, flag.DEFAULT_IGNORED_PATTERNS)
101+
self.assertEqual(2, updated)
102+
ignored_qs = project2.codebaseresources.status(flag.IGNORED_PATTERN)
103+
self.assertEqual(2, ignored_qs.count())
104+
self.assertIn(r1, ignored_qs)
105+
self.assertIn(r2, ignored_qs)
106+
92107
def test_scanpipe_pipes_flag_flag_not_analyzed_codebase_resources(self):
93108
resource1 = CodebaseResource.objects.create(
94109
project=self.project1, path="filename.ext"

0 commit comments

Comments
 (0)