From 7b7bf5d3907281054ea9ba2830f0e6812f19f3d4 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 16 Feb 2021 00:38:15 +0100 Subject: [PATCH] Fix a bug in parsing orphaned file names --- nw/core/project.py | 2 +- tests/test_core/test_core_project.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nw/core/project.py b/nw/core/project.py index de6d30a2..7e57650d 100644 --- a/nw/core/project.py +++ b/nw/core/project.py @@ -1397,7 +1397,7 @@ class NWProject(): if oName: oName = self.tr("[{0}] {1}").format( - oPrefix, oName.strip("[%s]" % oPrefix).strip() + oPrefix, oName.replace("[%s]" % oPrefix, "").strip() ) else: nOrph += 1 diff --git a/tests/test_core/test_core_project.py b/tests/test_core/test_core_project.py index 863a824a..07967b86 100644 --- a/tests/test_core/test_core_project.py +++ b/tests/test_core/test_core_project.py @@ -928,7 +928,7 @@ def testCoreProject_OrphanedFiles(dummyGUI, nwLipsum): # First Item with Meta Data orphPath = os.path.join(nwLipsum, "content", "636b6aa9b697b.nwd") with open(orphPath, mode="w", encoding="utf8") as outFile: - outFile.write("%%~name:Mars\n") + outFile.write("%%~name:[Recovered] Mars\n") outFile.write("%%~path:5eaea4e8cdee8/636b6aa9b697b\n") outFile.write("%%~kind:WORLD/NOTE\n") outFile.write("%%~invalid\n")