3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '4.5'

Browse source 
Conflicts:
	cura_app.py -> Due to moving some imports around.
This commit is contained in:
Ghostkeeper 2020-02-25 12:07:47 +01:00
commit a1438e91d0
No known key found for this signature in database
GPG key ID: 37E2020986774393
20 changed files with 113 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cura/CrashHandler.py
View file

@ -10,7 +10,7 @@ import os.path
import uuid
import json
import locale
from typing import cast
from typing import cast, Any
try:
from sentry_sdk.hub import Hub
@ -32,6 +32,8 @@ from UM.Resources import Resources
from cura import ApplicationMetadata
catalog = i18nCatalog("cura")
home_dir = os.path.expanduser("~")
MYPY = False
if MYPY:
@ -83,6 +85,21 @@ class CrashHandler:
self.dialog = QDialog()
self._createDialog()
@staticmethod
def pruneSensitiveData(obj: Any) -> Any:
if isinstance(obj, str):
return obj.replace(home_dir, "<user_home>")
if isinstance(obj, list):
return [CrashHandler.pruneSensitiveData(item) for item in obj]
if isinstance(obj, dict):
return {k: CrashHandler.pruneSensitiveData(v) for k, v in obj.items()}
return obj
@staticmethod
def sentryBeforeSend(event, hint):
return CrashHandler.pruneSensitiveData(event)
def _createEarlyCrashDialog(self):
dialog = QDialog()
dialog.setMinimumWidth(500)