Set up JS logging for both backends

Author: ferdnyc

src/windows/views/webview_backend/webengine.py

@@ -34,19 +34,38 @@
 
 from PyQt5.QtCore import QFileInfo, QUrl, Qt, QTimer
 from PyQt5.QtGui import QColor
-from PyQt5.QtWebEngineWidgets import QWebEngineView
+from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage
 from PyQt5.QtWebChannel import QWebChannel
 
 
+class LoggingWebEnginePage(QWebEnginePage):
+    """Override console.log message to display messages"""
+    def javaScriptConsoleMessage(self, level, msg, line, source):
+        log.log(
+            self.levels[level],
+            '%s@%Ld: %s' % (os.path.basename(source), line, msg))
+
+    def __init__(self, parent=None):
+        super().__init__(parent=parent)
+        self.setObjectName("LoggingWebEnginePage")
+        self.levels = [logging.INFO, logging.WARNING, logging.ERROR]
+
+
 class TimelineWebEngineView(QWebEngineView):
     """QtWebEngine Timeline Widget"""
 
     def __init__(self):
         """Initialization code required for widget"""
         super().__init__()
+        self.setObjectName("TimelineWebEngineView")
+
         self.document_is_ready = False
         self.html_path = os.path.join(info.PATH, 'timeline', 'index.html')
 
+        # Connect logging web page (for console.log)
+        self.new_page = LoggingWebEnginePage(self)
+        self.setPage(self.new_page)
+
         # Set background color of timeline
         self.page().setBackgroundColor(QColor("#363636"))
 

src/windows/views/webview_backend/webkit.py

@@ -36,10 +36,14 @@
 from PyQt5.QtWebKitWidgets import QWebView, QWebPage
 
 
-class LoggingWebPage(QWebPage):
+class LoggingWebKitPage(QWebPage):
     """Override console.log message to display messages"""
-    def javaScriptConsoleMessage(self, msg, line, source):
-        log.warning('JS: %s line %d: %s' % (source, line, msg))
+    def javaScriptConsoleMessage(self, msg, line, source, *args):
+        log.warning('%s@L%d: %s' % (os.path.basename(source), line, msg))
+
+    def __init__(self, parent=None):
+        super().__init__(parent=parent)
+        self.setObjectName("LoggingWebKitPage")
 
 
 class TimelineWebKitView(QWebView):
@@ -48,15 +52,17 @@ class TimelineWebKitView(QWebView):
     def __init__(self):
         """Initialization code required for widget"""
         super().__init__()
+        self.setObjectName("TimeWebKitView")
+
         self.document_is_ready = False
         self.html_path = os.path.join(info.PATH, 'timeline', 'index.html')
 
         # Delete the webview when closed
         self.setAttribute(Qt.WA_DeleteOnClose)
 
         # Connect logging web page (for console.log)
-        page = LoggingWebPage()
-        self.setPage(page)
+        self.new_page = LoggingWebPage(self)
+        self.setPage(self.new_page)
 
         # Disable image caching on timeline
         self.settings().setObjectCacheCapacities(0, 0, 0)