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

Merge pull request #226 from vkbo/bugfixes

Browse Source 
Fixed sorting bug for line numbers in index
This commit is contained in:
Veronica K. Berglyd Olsen
2020-05-24 22:15:12 +02:00
committed by GitHub
parent d011e5615d b9ccd94181
commit 5213186650
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/index.py
+4 -4
View File
@@ -354,7 +354,7 @@ class NWIndex():
else: else:
return False return False
sTitle = "T%d" % nLine sTitle = "T%06d" % nLine
self.refIndex[tHandle][sTitle] = { self.refIndex[tHandle][sTitle] = {
"tags" : [], "tags" : [],
"updated" : time(), "updated" : time(),
@@ -384,7 +384,7 @@ class NWIndex():
"""Count text stats and save the counts to the index. """Count text stats and save the counts to the index.
""" """
cC, wC, pC = countWords(theText) cC, wC, pC = countWords(theText)
sTitle = "T%d" % nTitle sTitle = "T%06d" % nTitle
if isNovel: if isNovel:
if tHandle in self.novelIndex: if tHandle in self.novelIndex:
if sTitle in self.novelIndex[tHandle]: if sTitle in self.novelIndex[tHandle]:
@@ -404,7 +404,7 @@ class NWIndex():
def _indexSynopsis(self, tHandle, isNovel, theText, nTitle): def _indexSynopsis(self, tHandle, isNovel, theText, nTitle):
"""Save the synopsis to the index. """Save the synopsis to the index.
""" """
sTitle = "T%d" % nTitle sTitle = "T%06d" % nTitle
if isNovel: if isNovel:
if tHandle in self.novelIndex: if tHandle in self.novelIndex:
if sTitle in self.novelIndex[tHandle]: if sTitle in self.novelIndex[tHandle]:
@@ -425,7 +425,7 @@ class NWIndex():
if not isValid or len(theBits) == 0: if not isValid or len(theBits) == 0:
return False return False
sTitle = "T%d" % nTitle sTitle = "T%06d" % nTitle
if sTitle not in self.refIndex[tHandle]: if sTitle not in self.refIndex[tHandle]:
logger.error("Cannot save tags to file %s, no title %s" % (tHandle, sTitle)) logger.error("Cannot save tags to file %s, no title %s" % (tHandle, sTitle))
return False return False
nw/gui/elements/outline.py
+1 -1
View File
@@ -408,7 +408,7 @@ class GuiProjectOutline(QTreeWidget):
newItem.setText(self.colIndex[nwOutline.HANDLE], tHandle) newItem.setText(self.colIndex[nwOutline.HANDLE], tHandle)
newItem.setText(self.colIndex[nwOutline.LEVEL], novIdx["level"]) newItem.setText(self.colIndex[nwOutline.LEVEL], novIdx["level"])
newItem.setText(self.colIndex[nwOutline.LABEL], nwItem.itemName) newItem.setText(self.colIndex[nwOutline.LABEL], nwItem.itemName)
newItem.setText(self.colIndex[nwOutline.LINE], sTitle[1:]) newItem.setText(self.colIndex[nwOutline.LINE], sTitle[1:].lstrip("0"))
newItem.setText(self.colIndex[nwOutline.SYNOP], novIdx["synopsis"]) newItem.setText(self.colIndex[nwOutline.SYNOP], novIdx["synopsis"])
newItem.setText(self.colIndex[nwOutline.CCOUNT], str(novIdx["cCount"])) newItem.setText(self.colIndex[nwOutline.CCOUNT], str(novIdx["cCount"]))
newItem.setText(self.colIndex[nwOutline.WCOUNT], str(novIdx["wCount"])) newItem.setText(self.colIndex[nwOutline.WCOUNT], str(novIdx["wCount"]))
tests/test_project.py
+3 -3
View File
@@ -156,7 +156,7 @@ def testIndexCheckThese(nwTempProj):
"@pov: Jane" "@pov: Jane"
)) ))
assert str(theIndex.tagIndex) == "{'Jane': [2, '2858dcd1057d3', 'CHARACTER']}" assert str(theIndex.tagIndex) == "{'Jane': [2, '2858dcd1057d3', 'CHARACTER']}"
assert theIndex.novelIndex[nHandle]["T1"]["title"] == "Hello World!" assert theIndex.novelIndex[nHandle]["T000001"]["title"] == "Hello World!"
assert str(theIndex.checkThese(["@tag", "Jane"], cItem)) == "[True, True]" assert str(theIndex.checkThese(["@tag", "Jane"], cItem)) == "[True, True]"
assert str(theIndex.checkThese(["@tag", "John"], cItem)) == "[True, True]" assert str(theIndex.checkThese(["@tag", "John"], cItem)) == "[True, True]"
@@ -196,10 +196,10 @@ def testIndexMeta(nwTempProj):
"Well, not really.\n" "Well, not really.\n"
)) ))
assert str(theIndex.tagIndex) == "{'Jane': [2, '2858dcd1057d3', 'CHARACTER']}" assert str(theIndex.tagIndex) == "{'Jane': [2, '2858dcd1057d3', 'CHARACTER']}"
assert theIndex.novelIndex[nHandle]["T1"]["title"] == "Hello World!" assert theIndex.novelIndex[nHandle]["T000001"]["title"] == "Hello World!"
# The novel structure should contain the pointer to the novel file header # The novel structure should contain the pointer to the novel file header
assert str(theIndex.getNovelStructure()) == "['41cfc0d1f2d12:T1']" assert str(theIndex.getNovelStructure()) == "['41cfc0d1f2d12:T000001']"
# The novel file should have the correct counts # The novel file should have the correct counts
cC, wC, pC = theIndex.getCounts(nHandle) cC, wC, pC = theIndex.getCounts(nHandle)