read legacy base64 encoded lettering params (#1088)

pull/1097/head
Kaalleen 2021-03-15 18:06:22 +01:00 zatwierdzone przez GitHub
rodzic 0adda03425
commit 142b3a71d8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 11 dodań i 5 usunięć

Wyświetl plik

@ -1,6 +1,7 @@
import json
import os
import sys
from base64 import b64decode
import appdirs
import inkex
@ -86,12 +87,17 @@ class LetteringFrame(wx.Frame):
"scale": 100
})
try:
if INKSTITCH_LETTERING in self.group.attrib:
if INKSTITCH_LETTERING in self.group.attrib:
try:
self.settings.update(json.loads(self.group.get(INKSTITCH_LETTERING)))
return
except (TypeError, ValueError):
pass
except json.decoder.JSONDecodeError:
# legacy base64 encoded (changed in v2.0)
try:
self.settings.update(json.loads(b64decode(self.group.get(INKSTITCH_LETTERING))))
except (TypeError, ValueError):
pass
except (TypeError, ValueError):
pass
def apply_settings(self):
"""Make the settings in self.settings visible in the UI."""