joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce generated device ids

Browse Source
This commit is contained in:
Jakob Ketterl 2021-04-18 19:04:43 +02:00
parent e8cf014903
commit 05ea11f5d1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
owrx/controllers/settings/sdr.py
View File

@ -12,6 +12,7 @@ from owrx.form.validator import RequiredValidator
from owrx.property import PropertyLayer, PropertyStack from owrx.property import PropertyLayer, PropertyStack
from owrx.breadcrumb import BreadcrumbMixin, Breadcrumb, BreadcrumbItem from owrx.breadcrumb import BreadcrumbMixin, Breadcrumb, BreadcrumbItem
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
from uuid import uuid4
class SdrDeviceBreadcrumb(SettingsBreadcrumb): class SdrDeviceBreadcrumb(SettingsBreadcrumb):
@ -280,11 +281,8 @@ class SdrDeviceController(SdrFormControllerWithModal):
class NewSdrDeviceController(SettingsFormController): class NewSdrDeviceController(SettingsFormController):
def __init__(self, handler, request, options): def __init__(self, handler, request, options):
super().__init__(handler, request, options) super().__init__(handler, request, options)
id_layer = PropertyLayer(id="")
self.data_layer = PropertyLayer(name="", type="", profiles=PropertyLayer()) self.data_layer = PropertyLayer(name="", type="", profiles=PropertyLayer())
self.stack = PropertyStack() self.sdr_id = str(uuid4())
self.stack.addLayer(0, id_layer)
self.stack.addLayer(1, self.data_layer)
def get_breadcrumb(self) -> Breadcrumb: def get_breadcrumb(self) -> Breadcrumb:
return SdrDeviceBreadcrumb().append(BreadcrumbItem("New device", "settings/sdr/newsdr")) return SdrDeviceBreadcrumb().append(BreadcrumbItem("New device", "settings/sdr/newsdr"))
@ -302,7 +300,6 @@ class NewSdrDeviceController(SettingsFormController):
+ "options is different for each type.<br />Note: This dropdown only shows device types that have " + "options is different for each type.<br />Note: This dropdown only shows device types that have "
+ "their requirements met. If a type is missing from the list, please check the feature report.", + "their requirements met. If a type is missing from the list, please check the feature report.",
), ),
TextInput("id", "Device ID", validator=RequiredValidator()),
) )
] ]
@ -310,20 +307,21 @@ class NewSdrDeviceController(SettingsFormController):
return "New device" return "New device"
def getData(self): def getData(self):
return self.stack return self.data_layer
def store(self): def store(self):
# need to overwrite the existing key in the config since the layering won't capture the changes otherwise # need to overwrite the existing key in the config since the layering won't capture the changes otherwise
config = Config.get() config = Config.get()
sdrs = config["sdrs"] sdrs = config["sdrs"]
if self.stack["id"] in sdrs: # a uuid should be unique, so i'm not sure if there's a point in this check
raise ValueError("device {} already exists!".format(self.stack["id"])) if self.sdr_id in sdrs:
sdrs[self.stack["id"]] = self.data_layer raise ValueError("device {} already exists!".format(self.sdr_id))
sdrs[self.sdr_id] = self.data_layer
config["sdrs"] = sdrs config["sdrs"] = sdrs
super().store() super().store()
def getSuccessfulRedirect(self): def getSuccessfulRedirect(self):
return "{}settings/sdr/{}".format(self.get_document_root(), quote(self.stack["id"])) return "{}settings/sdr/{}".format(self.get_document_root(), quote(self.sdr_id))
class SdrProfileController(SdrFormControllerWithModal): class SdrProfileController(SdrFormControllerWithModal):