Skip to content

Commit 0c67c18

Browse files
stephenfinfstachura
authored andcommitted
parser: Remove matching label from subject prefixes
Extend the parser to strip the label from the list of prefixes. This means we don't duplicate things twice in the UI.
1 parent 65dcede commit 0c67c18

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

‎patchwork/parser.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,14 @@ def parse_labels(subject_prefixes, project):
635635
Args:
636636
subject_prefixes: List of subject prefixes to extract tags from
637637
"""
638-
return Label.objects.filter(
638+
labels = Label.objects.filter(
639639
Q(project=project) | Q(project=None), name__in=subject_prefixes
640640
)
641+
for label in labels:
642+
if label.name in subject_prefixes:
643+
subject_prefixes.remove(label.name)
644+
645+
return labels
641646

642647

643648
def _find_content(mail):

‎patchwork/tests/unit/test_parser.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,16 +1204,24 @@ def test_version(self):
12041204
def test_labels(self):
12051205
label = create_label(name='RFC')
12061206

1207-
self.assertEqual(list(parse_labels(['RFC'], label.project)), [label])
1208-
self.assertEqual(list(parse_labels(['rfcx'], label.project)), [])
1207+
prefixes = ['RFC']
1208+
self.assertEqual(list(parse_labels(prefixes, label.project)), [label])
1209+
self.assertEqual(prefixes, [])
12091210

1210-
project = create_project()
1211+
prefixes = ['rfcx']
1212+
self.assertEqual(list(parse_labels(prefixes, label.project)), [])
1213+
self.assertEqual(prefixes, ['rfcx'])
12111214

1212-
self.assertEqual(list(parse_labels(['RFC'], project)), [])
1215+
project = create_project()
1216+
prefixes = ['RFC']
1217+
self.assertEqual(list(parse_labels(prefixes, project)), [])
1218+
self.assertEqual(prefixes, ['RFC'])
12131219

12141220
label = create_label(name='stuff', project=None)
12151221

1216-
self.assertEqual(list(parse_labels(['stuff'], project)), [label])
1222+
prefixes = ['stuff']
1223+
self.assertEqual(list(parse_labels(prefixes, project)), [label])
1224+
self.assertEqual(prefixes, [])
12171225

12181226

12191227
class SubjectMatchTest(TestCase):

0 commit comments

Comments
 (0)