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

Bypass html cache when not building html doc

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-01-28 00:40:10 +01:00
parent 3e5813323b
commit 2e4558a5d3
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/build.py
+16 -13
View File
@@ -80,6 +80,7 @@ class GuiBuildNovel(QDialog):
self.htmlText = [] # List of html documents self.htmlText = [] # List of html documents
self.htmlStyle = [] # List of html styles self.htmlStyle = [] # List of html styles
self.nwdText = [] # List of markdown documents self.nwdText = [] # List of markdown documents
self.htmlSize = 0 # Size of the html document
self.buildTime = 0 # The timestamp of the last build self.buildTime = 0 # The timestamp of the last build
self.setWindowTitle("Build Novel Project") self.setWindowTitle("Build Novel Project")
@@ -553,12 +554,13 @@ class GuiBuildNovel(QDialog):
tStart = int(time()) tStart = int(time())
self.htmlText = [] self.htmlText = []
self.htmlStyle = [] self.htmlStyle = []
self.nwdText = [] self.nwdText = []
self.htmlSize = 0
makeHtml = ToHtml(self.theProject, self.theParent) makeHtml = ToHtml(self.theProject, self.theParent)
htmlSize = self._doBuild(makeHtml) self._doBuild(makeHtml)
if replaceTabs: if replaceTabs:
htmlText = [] htmlText = []
@@ -585,7 +587,7 @@ class GuiBuildNovel(QDialog):
else: else:
self.docView.setStyleSheet(self.htmlStyle) self.docView.setStyleSheet(self.htmlStyle)
if htmlSize < nwConst.MAX_BUILDSIZE: if self.htmlSize < nwConst.MAX_BUILDSIZE:
self.docView.setContent(self.htmlText, self.buildTime) self.docView.setContent(self.htmlText, self.buildTime)
self._enableQtSave(True) self._enableQtSave(True)
else: else:
@@ -642,6 +644,7 @@ class GuiBuildNovel(QDialog):
if isHtml: if isHtml:
bldObj.setStyles(not noStyling) bldObj.setStyles(not noStyling)
self.htmlSize = 0
if isOdt: if isOdt:
bldObj.setColourHeaders(not noStyling) bldObj.setColourHeaders(not noStyling)
@@ -653,8 +656,6 @@ class GuiBuildNovel(QDialog):
self.buildProgress.setMaximum(len(self.theProject.projTree)) self.buildProgress.setMaximum(len(self.theProject.projTree))
self.buildProgress.setValue(0) self.buildProgress.setValue(0)
accSize = 0
for nItt, tItem in enumerate(self.theProject.projTree): for nItt, tItem in enumerate(self.theProject.projTree):
noteRoot = noteFiles noteRoot = noteFiles
@@ -667,9 +668,10 @@ class GuiBuildNovel(QDialog):
# Add headers for root folders of notes # Add headers for root folders of notes
bldObj.addRootHeading(tItem.itemHandle) bldObj.addRootHeading(tItem.itemHandle)
bldObj.doConvert() bldObj.doConvert()
self.htmlText.append(bldObj.getResult()) if isHtml:
self.nwdText.append(bldObj.getFilteredMarkdown()) self.htmlText.append(bldObj.getResult())
accSize += bldObj.getResultSize() self.nwdText.append(bldObj.getFilteredMarkdown())
self.htmlSize += bldObj.getResultSize()
elif self._checkInclude(tItem, noteFiles, novelFiles, ignoreFlag): elif self._checkInclude(tItem, noteFiles, novelFiles, ignoreFlag):
bldObj.setText(tItem.itemHandle) bldObj.setText(tItem.itemHandle)
@@ -678,9 +680,10 @@ class GuiBuildNovel(QDialog):
bldObj.doHeaders() bldObj.doHeaders()
bldObj.doConvert() bldObj.doConvert()
bldObj.doPostProcessing() bldObj.doPostProcessing()
self.htmlText.append(bldObj.getResult()) if isHtml:
self.nwdText.append(bldObj.getFilteredMarkdown()) self.htmlText.append(bldObj.getResult())
accSize += bldObj.getResultSize() self.nwdText.append(bldObj.getFilteredMarkdown())
self.htmlSize += bldObj.getResultSize()
except Exception as e: except Exception as e:
logger.error("Failed to generate html of document '%s'" % tItem.itemHandle) logger.error("Failed to generate html of document '%s'" % tItem.itemHandle)
@@ -703,7 +706,7 @@ class GuiBuildNovel(QDialog):
"<br>-&nbsp;%s" "<br>-&nbsp;%s"
) % "<br>-&nbsp;".join(bldObj.errData), nwAlert.ERROR) ) % "<br>-&nbsp;".join(bldObj.errData), nwAlert.ERROR)
return accSize return
def _checkInclude(self, theItem, noteFiles, novelFiles, ignoreFlag): def _checkInclude(self, theItem, noteFiles, novelFiles, ignoreFlag):
"""This function checks whether a file should be included in the """This function checks whether a file should be included in the