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

Annotate index class and change file format slightly to match others

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2023-06-13 17:30:07 +02:00
parent 1b85f782a6
commit 9ac61105f3
3 changed files with 251 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/index.py
+246 -269
View File
File diff suppressed because it is too large Load Diff
tests/reference/coreIndex_LoadSave_tagsIndex.json
+2 -2
View File
@@ -1,10 +1,10 @@
{ {
"tagsIndex": { "novelWriter.tagsIndex": {
"Bod": {"handle": "4c4f28287af27", "heading": "T0001", "class": "CHARACTER"}, "Bod": {"handle": "4c4f28287af27", "heading": "T0001", "class": "CHARACTER"},
"Main": {"handle": "2426c6f0ca922", "heading": "T0001", "class": "PLOT"}, "Main": {"handle": "2426c6f0ca922", "heading": "T0001", "class": "PLOT"},
"Europe": {"handle": "04468803b92e1", "heading": "T0001", "class": "WORLD"} "Europe": {"handle": "04468803b92e1", "heading": "T0001", "class": "WORLD"}
}, },
"itemIndex": { "novelWriter.itemIndex": {
"7a992350f3eb6": { "7a992350f3eb6": {
"headings": { "headings": {
"T0001": {"level": "H1", "title": "Lorem Ipsum", "line": 1, "tag": "", "cCount": 230, "wCount": 40, "pCount": 3, "synopsis": ""} "T0001": {"level": "H1", "title": "Lorem Ipsum", "line": 1, "tag": "", "cCount": 230, "wCount": 40, "pCount": 3, "synopsis": ""}
tests/test_core/test_core_index.py
+3 -3
View File
@@ -125,7 +125,7 @@ def testCoreIndex_LoadSave(monkeypatch, prjLipsum, mockGUI, tstPaths):
assert theIndex.indexBroken is True assert theIndex.indexBroken is True
# Write an index file that passes loading, but is still empty # Write an index file that passes loading, but is still empty
writeFile(projFile, '{"tagsIndex": {}, "itemIndex": {}}') writeFile(projFile, '{"novelWriter.tagsIndex": {}, "novelWriter.itemIndex": {}}')
assert theIndex.loadIndex() is True assert theIndex.loadIndex() is True
assert theIndex.indexBroken is False assert theIndex.indexBroken is False
@@ -1071,13 +1071,13 @@ def testCoreIndex_ItemIndex(mockGUI, fncPath, mockRnd):
assert nStruct[3][0] == uHandle assert nStruct[3][0] == uHandle
# Novel structure with root handle set # Novel structure with root handle set
nStruct = list(itemIndex.iterNovelStructure(rootHandle=C.hNovelRoot)) nStruct = list(itemIndex.iterNovelStructure(rHandle=C.hNovelRoot))
assert len(nStruct) == 3 assert len(nStruct) == 3
assert nStruct[0][0] == nHandle assert nStruct[0][0] == nHandle
assert nStruct[1][0] == cHandle assert nStruct[1][0] == cHandle
assert nStruct[2][0] == sHandle assert nStruct[2][0] == sHandle
nStruct = list(itemIndex.iterNovelStructure(rootHandle=mHandle)) nStruct = list(itemIndex.iterNovelStructure(rHandle=mHandle))
assert len(nStruct) == 1 assert len(nStruct) == 1
assert nStruct[0][0] == uHandle assert nStruct[0][0] == uHandle