paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-07-22 17:54:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix log matches related to newlines, add newlines to stdout.writelines

Browse Source
This commit is contained in:
shamoon 2025-05-13 09:21:10 -07:00
parent 777299fcb9
commit b8419671c9
No known key found for this signature in database
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/documents/management/commands/document_fuzzy_match.py
View File

@ -125,14 +125,14 @@ class Command(MultiProcessMixin, ProgressBarMixin, BaseCommand):
messages.append( messages.append(
self.style.NOTICE( self.style.NOTICE(
f"Document {result.doc_one_pk} fuzzy match" f"Document {result.doc_one_pk} fuzzy match"
f" to {result.doc_two_pk} (confidence {result.ratio:.3f})", f" to {result.doc_two_pk} (confidence {result.ratio:.3f})\n",
), ),
) )
maybe_delete_ids.append(result.doc_two_pk) maybe_delete_ids.append(result.doc_two_pk)
if len(messages) == 0: if len(messages) == 0:
messages.append( messages.append(
self.style.SUCCESS("No matches found"), self.style.SUCCESS("No matches found\n"),
) )
self.stdout.writelines( self.stdout.writelines(
messages, messages,

21
src/documents/tests/test_management_fuzzy.py
View File

@ -87,7 +87,7 @@ class TestFuzzyMatchCommand(TestCase):
filename="other_test.pdf", filename="other_test.pdf",
) )
stdout, _ = self.call_command() stdout, _ = self.call_command()
self.assertEqual(stdout, "No matches found\n") self.assertIn("No matches found", stdout)
def test_with_matches(self): def test_with_matches(self):
""" """
@ -116,7 +116,7 @@ class TestFuzzyMatchCommand(TestCase):
filename="other_test.pdf", filename="other_test.pdf",
) )
stdout, _ = self.call_command("--processes", "1") stdout, _ = self.call_command("--processes", "1")
self.assertRegex(stdout, self.MSG_REGEX + "\n") self.assertRegex(stdout, self.MSG_REGEX)
def test_with_3_matches(self): def test_with_3_matches(self):
""" """
@ -152,11 +152,10 @@ class TestFuzzyMatchCommand(TestCase):
filename="final_test.pdf", filename="final_test.pdf",
) )
stdout, _ = self.call_command() stdout, _ = self.call_command()
lines = [x.strip() for x in stdout.split("\n") if len(x.strip())] lines = [x.strip() for x in stdout.splitlines() if x.strip()]
self.assertEqual(len(lines), 3) self.assertEqual(len(lines), 3)
self.assertRegex(lines[0], self.MSG_REGEX) for line in lines:
self.assertRegex(lines[1], self.MSG_REGEX) self.assertRegex(line, self.MSG_REGEX)
self.assertRegex(lines[2], self.MSG_REGEX)
def test_document_deletion(self): def test_document_deletion(self):
""" """
@ -197,14 +196,12 @@ class TestFuzzyMatchCommand(TestCase):
stdout, _ = self.call_command("--delete") stdout, _ = self.call_command("--delete")
lines = [x.strip() for x in stdout.split("\n") if len(x.strip())] self.assertIn(
self.assertEqual(len(lines), 3)
self.assertEqual(
lines[0],
"The command is configured to delete documents. Use with caution", "The command is configured to delete documents. Use with caution",
stdout,
) )
self.assertRegex(lines[1], self.MSG_REGEX) self.assertRegex(stdout, self.MSG_REGEX)
self.assertEqual(lines[2], "Deleting 1 documents based on ratio matches") self.assertIn("Deleting 1 documents based on ratio matches", stdout)
self.assertEqual(Document.objects.count(), 2) self.assertEqual(Document.objects.count(), 2)
self.assertIsNotNone(Document.objects.get(pk=1)) self.assertIsNotNone(Document.objects.get(pk=1))