Merge pull request #299 from vkbo/doc_view_bugfix

Markdown to HTML Converter Bug

nw/__init__.py

@@ -216,6 +216,7 @@ def main(sysArgs=None):
         logger.addHandler(cHandle)
 
     logger.setLevel(debugLevel)
+    logger.info("This is %s %s" % (__package__, __version__))
 
     # Check Packages and Versions
     errorData = []

nw/core/tohtml.py

@@ -312,6 +312,7 @@ class ToHtml(Tokenizer):
         refTags = []
         if theBits[0] in nwLabels.KEY_NAME:
             retText += "<span class='tags'>%s:</span>&nbsp;" % nwLabels.KEY_NAME[theBits[0]]
+            if len(theBits) > 1:
                 if theBits[0] == nwKeyWords.TAG_KEY:
                     retText += "<a name='tag_%s'>%s</a>" % (
                         theBits[1], theBits[1]

nw/gui/build.py

@@ -476,6 +476,7 @@ class GuiBuildNovel(QDialog):
             noteRoot &= tItem.itemType == nwItemType.ROOT
             noteRoot &= tItem.itemClass != nwItemClass.NOVEL
 
+            try:
                 if noteRoot:
                     # Add headers for root folders of notes
                     makeHtml.addRootHeading(tItem.itemHandle)
@@ -493,6 +494,15 @@ class GuiBuildNovel(QDialog):
                     self.htmlText.append(makeHtml.getResult())
                     self.nwdText.append(makeHtml.getFilteredMarkdown())
 
+            except Exception as e:
+                logger.error("Failed to generate html of document '%s'" % tItem.itemHandle)
+                logger.error(str(e))
+                self.docView.setText((
+                    "Failed to generate preview. "
+                    "Document with title '%s' could not be parsed."
+                ) % tItem.itemName)
+                return False
+
             # Update progress bar, also for skipped items
             self.buildProgress.setValue(nItt+1)
 

nw/gui/docviewer.py

@@ -135,11 +135,22 @@ class GuiDocViewer(QTextBrowser):
         aDoc = ToHtml(self.theProject, self.theParent)
         aDoc.setPreview(True, self.mainConf.viewComments)
         aDoc.setLinkHeaders(True)
+
+        # Be extra careful here to prevent crashes when first opening a
+        # project as a crash here leaves no way of recovering.
+        # See issue #298
+        try:
             aDoc.setText(tHandle)
             aDoc.doAutoReplace()
             aDoc.tokenizeText()
             aDoc.doConvert()
             aDoc.doPostProcessing()
+        except Exception as e:
+            logger.error("Failed to generate preview for document with handle '%s'" % tHandle)
+            logger.error(str(e))
+            self.setText("An error occurred while generating the preview.")
+            return False
+
         self.setHtml(aDoc.theResult)
         if self.theHandle == tHandle:
             self.verticalScrollBar().setValue(sPos)