Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use forward slash for ToC file

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-11-24 19:25:46 +01:00
parent 0449cf824d
commit e30d2cbbf1
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/tree.py
+1 -1
View File
@@ -343,7 +343,7 @@ class NWTree:
file = f"{item.itemHandle}.nwd" file = f"{item.itemHandle}.nwd"
if (contentPath / file).is_file(): if (contentPath / file).is_file():
tocLine = "{0:<25s} {1:<9s} {2:<8s} {3:s}".format( tocLine = "{0:<25s} {1:<9s} {2:<8s} {3:s}".format(
str(Path("content") / file), f"content/{file}",
item.itemClass.name, item.itemClass.name,
item.itemLayout.name, item.itemLayout.name,
item.itemName, item.itemName,
tests/test_core/test_core_tree.py
+3 -7
View File
@@ -436,10 +436,6 @@ def testCoreTree_ToCFile(monkeypatch, fncPath, mockGUI, mockItems):
mp.setattr("builtins.open", causeOSError) mp.setattr("builtins.open", causeOSError)
assert tree.writeToCFile() is False assert tree.writeToCFile() is False
pathA = str(Path("content") / "000000000000c.nwd")
pathB = str(Path("content") / "000000000000e.nwd")
pathC = str(Path("content") / "000000000000f.nwd")
# Allow writing # Allow writing
assert tree.writeToCFile() is True assert tree.writeToCFile() is True
assert (fncPath / nwFiles.TOC_TXT).read_text() == ( assert (fncPath / nwFiles.TOC_TXT).read_text() == (
@@ -449,7 +445,7 @@ def testCoreTree_ToCFile(monkeypatch, fncPath, mockGUI, mockItems):
"\n" "\n"
"File Name Class Layout Document Label\n" "File Name Class Layout Document Label\n"
"--------------------------------------------------------------\n" "--------------------------------------------------------------\n"
f"{pathA} NOVEL DOCUMENT Title Page\n" "content/000000000000c.nwd NOVEL DOCUMENT Title Page\n"
f"{pathB} NOVEL DOCUMENT New Chapter\n" "content/000000000000e.nwd NOVEL DOCUMENT New Chapter\n"
f"{pathC} NOVEL DOCUMENT New Scene\n" "content/000000000000f.nwd NOVEL DOCUMENT New Scene\n"
) )