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

Merge branch 'main' into release_1.0

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-01-03 15:12:56 +01:00
parent b9e28a5f09 9253872b5b
commit 418d45cd8d
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/index.py
+7 -12
View File
@@ -143,16 +143,11 @@ class NWIndex():
logger.error(str(e))
return False
if "tagIndex" in theData.keys():
self.tagIndex = theData["tagIndex"]
if "refIndex" in theData.keys():
self.refIndex = theData["refIndex"]
if "novelIndex" in theData.keys():
self.novelIndex = theData["novelIndex"]
if "noteIndex" in theData.keys():
self.noteIndex = theData["noteIndex"]
if "textCounts" in theData.keys():
self.textCounts = theData["textCounts"]
self.tagIndex = theData.get("tagIndex", {})
self.refIndex = theData.get("refIndex", {})
self.novelIndex = theData.get("novelIndex", {})
self.noteIndex = theData.get("noteIndex", {})
self.textCounts = theData.get("textCounts", {})
nowTime = round(time())
self.timeNovel = nowTime
@@ -221,6 +216,7 @@ class NWIndex():
except Exception:
self.indexBroken = True
logger.debug("Index check complete")
if self.indexBroken:
self.clearIndex()
self.theParent.makeAlert(
@@ -593,8 +589,7 @@ class NWIndex():
return theRefs
for refTitle in self.refIndex[tHandle]:
theTags = self.refIndex[tHandle][refTitle].get("tags", None)
for aTag in theTags:
for aTag in self.refIndex[tHandle][refTitle].get("tags", []):
if len(aTag) == 3 and (sTitle is None or sTitle == refTitle):
theRefs[aTag[1]].append(aTag[2])