From a4bb77bfd0dbaa299f3f4778bbebf42b097ac429 Mon Sep 17 00:00:00 2001 From: kdmukai Date: Fri, 25 Feb 2022 10:50:36 -0600 Subject: [PATCH] Minor bugfix, compatibility fix --- src/seedsigner/camera.py | 2 +- src/seedsigner/models/decode_qr.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/seedsigner/camera.py b/src/seedsigner/camera.py index 027858aa..10112bba 100644 --- a/src/seedsigner/camera.py +++ b/src/seedsigner/camera.py @@ -20,7 +20,7 @@ class Camera(Singleton): from seedsigner.models import Settings if cls._instance is None: cls._instance = cls.__new__(cls) - cls._instance._camera_rotation = Settings.get_instance().get_value(SettingsConstants.SETTING__CAMERA_ROTATION) + cls._instance._camera_rotation = int(Settings.get_instance().get_value(SettingsConstants.SETTING__CAMERA_ROTATION)) return cls._instance diff --git a/src/seedsigner/models/decode_qr.py b/src/seedsigner/models/decode_qr.py index f317604f..ca03468e 100644 --- a/src/seedsigner/models/decode_qr.py +++ b/src/seedsigner/models/decode_qr.py @@ -746,12 +746,13 @@ class SettingsQrDecoder(BaseSingleFrameQrDecoder): def add(self, segment, qr_type=QRType.SETTINGS): - print(f"SettingsQR: {segment}") + print(f"SettingsQR:\n{segment}") try: self.settings = {} - # QR Settings format is space-separated key/value pairs - for entry in segment.split(" "): + # QR Settings format is space-separated key/value pairs, but should also + # parse \n-separated keys. + for entry in segment.split(): key = entry.split("=")[0].strip() value = entry.split("=")[1].strip() self.settings[key] = value