From 2f174b40a6995af7b9096aeb2061a4d1d6ed93a7 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Wed, 15 Apr 2020 16:21:47 -0300 Subject: [PATCH] Set to use a regular expression to remove the server name because it is less prone to break in future updates. --- qt/aqt/webview.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index bb6ebc637..b5958bb36 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -4,6 +4,7 @@ import dataclasses import json import math +import re import sys from typing import Any, Callable, List, Optional, Sequence, Tuple @@ -70,14 +71,14 @@ class AnkiWebPage(QWebEnginePage): # type: ignore def javaScriptConsoleMessage(self, level, msg, line, srcID): # not translated because console usually not visible, # and may only accept ascii text - srcID = srcID.replace(AnkiWebView.webBundlePath("/"), "") + srcID = re.sub(r"(?mi).+://[^/]+", "", srcID) if level == QWebEnginePage.InfoMessageLevel: level = "info" elif level == QWebEnginePage.WarningMessageLevel: level = "warning" elif level == QWebEnginePage.ErrorMessageLevel: level = "error" - buf = "JS %(t)s /%(f)s:%(a)d %(b)s" % dict( + buf = "JS %(t)s %(f)s:%(a)d %(b)s" % dict( t=level, a=line, f=srcID, b=msg + "\n" ) # ensure we don't try to write characters the terminal can't handle