refactor owrx.form -> owrx.form.input

owrx/controllers/settings/backgrounddecoding.py

@@ -1,5 +1,5 @@
 from owrx.controllers.settings import SettingsFormController, Section
-from owrx.form import CheckboxInput, ServicesCheckboxInput
+from owrx.form.input import CheckboxInput, ServicesCheckboxInput
 from owrx.breadcrumb import Breadcrumb, BreadcrumbItem
 from owrx.controllers.settings import SettingsBreadcrumb
 

owrx/controllers/settings/decoding.py

@@ -1,7 +1,7 @@
 from owrx.controllers.settings import SettingsFormController, Section, SettingsBreadcrumb
-from owrx.form import CheckboxInput, NumberInput, DropdownInput, Js8ProfileCheckboxInput, MultiCheckboxInput, Option
+from owrx.form.input import CheckboxInput, NumberInput, DropdownInput, Js8ProfileCheckboxInput, MultiCheckboxInput, Option
-from owrx.form.wfm import WfmTauValues
+from owrx.form.input.wfm import WfmTauValues
-from owrx.form.wsjt import Q65ModeMatrix, WsjtDecodingDepthsInput
+from owrx.form.input.wsjt import Q65ModeMatrix, WsjtDecodingDepthsInput
 from owrx.wsjt import Fst4Profile, Fst4wProfile
 from owrx.breadcrumb import Breadcrumb, BreadcrumbItem
 

owrx/controllers/settings/general.py

@@ -1,6 +1,6 @@
 from owrx.controllers.settings import Section, SettingsFormController
 from owrx.config.core import CoreConfig
-from owrx.form import (
+from owrx.form.input import (
     TextInput,
     NumberInput,
     FloatInput,
@@ -9,10 +9,10 @@ from owrx.form import (
     DropdownInput,
     Option,
 )
-from owrx.form.converter import WaterfallColorsConverter, IntConverter
+from owrx.form.input.converter import WaterfallColorsConverter, IntConverter
-from owrx.form.receiverid import ReceiverKeysConverter
+from owrx.form.input.receiverid import ReceiverKeysConverter
-from owrx.form.gfx import AvatarInput, TopPhotoInput
+from owrx.form.input.gfx import AvatarInput, TopPhotoInput
-from owrx.form.device import WaterfallLevelsInput, WaterfallAutoLevelsInput
+from owrx.form.input.device import WaterfallLevelsInput, WaterfallAutoLevelsInput
 from owrx.waterfall import WaterfallOptions
 from owrx.breadcrumb import Breadcrumb, BreadcrumbItem
 from owrx.controllers.settings import SettingsBreadcrumb

owrx/controllers/settings/reporting.py

@@ -1,7 +1,7 @@
 from owrx.controllers.settings import SettingsFormController, Section, SettingsBreadcrumb
-from owrx.form.converter import OptionalConverter
+from owrx.form.input.converter import OptionalConverter
-from owrx.form.aprs import AprsBeaconSymbols, AprsAntennaDirections
+from owrx.form.input.aprs import AprsBeaconSymbols, AprsAntennaDirections
-from owrx.form import TextInput, CheckboxInput, DropdownInput, NumberInput
+from owrx.form.input import TextInput, CheckboxInput, DropdownInput, NumberInput
 from owrx.breadcrumb import Breadcrumb, BreadcrumbItem
 
 

owrx/controllers/settings/sdr.py

@@ -7,8 +7,8 @@ from owrx.connection import OpenWebRxReceiverClient
 from owrx.controllers.settings import Section, SettingsBreadcrumb
 from urllib.parse import quote, unquote
 from owrx.sdr import SdrService
-from owrx.form import TextInput, DropdownInput, Option
+from owrx.form.input import TextInput, DropdownInput, Option
-from owrx.form.validator import RequiredValidator
+from owrx.form.input.validator import RequiredValidator
 from owrx.property import PropertyLayer
 from owrx.breadcrumb import BreadcrumbMixin, Breadcrumb, BreadcrumbItem
 from abc import ABCMeta, abstractmethod

owrx/form/input/__init__.py

@@ -1,8 +1,8 @@
 from abc import ABC
 from owrx.modes import Modes
 from owrx.config import Config
-from owrx.form.validator import Validator
+from owrx.form.input.validator import Validator
-from owrx.form.converter import Converter, NullConverter, IntConverter, FloatConverter, EnumConverter
+from owrx.form.input.converter import Converter, NullConverter, IntConverter, FloatConverter, EnumConverter
 from enum import Enum
 
 

owrx/form/input/aprs.py

@@ -1,4 +1,4 @@
-from owrx.form import DropdownEnum
+from owrx.form.input import DropdownEnum
 
 
 class AprsBeaconSymbols(DropdownEnum):

owrx/form/input/device.py

@@ -1,4 +1,4 @@
-from owrx.form import Input, CheckboxInput, DropdownInput, DropdownEnum, TextInput
+from owrx.form.input import Input, CheckboxInput, DropdownInput, DropdownEnum, TextInput
 from owrx.soapy import SoapySettings
 from functools import reduce
 from operator import and_

owrx/form/input/gfx.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from owrx.form import Input
+from owrx.form.input import Input
 from datetime import datetime
 
 

owrx/form/input/receiverid.py

@@ -1,4 +1,4 @@
-from owrx.form.converter import Converter
+from owrx.form.input.converter import Converter
 
 
 class ReceiverKeysConverter(Converter):

owrx/form/input/wfm.py

@@ -1,4 +1,4 @@
-from owrx.form import DropdownEnum
+from owrx.form.input import DropdownEnum
 
 
 class WfmTauValues(DropdownEnum):

owrx/form/input/wsjt.py

@@ -1,5 +1,5 @@
-from owrx.form import Input
+from owrx.form.input import Input
-from owrx.form.converter import JsonConverter
+from owrx.form.input.converter import JsonConverter
 from owrx.wsjt import Q65Mode, Q65Interval
 from owrx.modes import Modes, WsjtMode
 import html

owrx/source/__init__.py

@@ -12,10 +12,10 @@ from owrx.command import CommandMapper
 from owrx.socket import getAvailablePort
 from owrx.property import PropertyStack, PropertyLayer, PropertyFilter, PropertyCarousel, PropertyDeleted
 from owrx.property.filter import ByLambda
-from owrx.form import Input, TextInput, NumberInput, CheckboxInput, ModesInput, ExponentialInput
+from owrx.form.input import Input, TextInput, NumberInput, CheckboxInput, ModesInput, ExponentialInput
-from owrx.form.converter import OptionalConverter
+from owrx.form.input.converter import OptionalConverter
-from owrx.form.device import GainInput, SchedulerInput, WaterfallLevelsInput
+from owrx.form.input.device import GainInput, SchedulerInput, WaterfallLevelsInput
-from owrx.form.validator import RequiredValidator
+from owrx.form.input.validator import RequiredValidator
 from owrx.controllers.settings import Section
 from owrx.feature import FeatureDetector
 from typing import List

owrx/source/airspy.py

@@ -1,6 +1,6 @@
 from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
-from owrx.form import Input, CheckboxInput
+from owrx.form.input import Input, CheckboxInput
-from owrx.form.device import BiasTeeInput
+from owrx.form.input.device import BiasTeeInput
 from typing import List
 
 

owrx/source/connector.py

@@ -3,7 +3,7 @@ from owrx.socket import getAvailablePort
 import socket
 from owrx.command import Flag, Option
 from typing import List
-from owrx.form import Input, NumberInput, CheckboxInput
+from owrx.form.input import Input, NumberInput, CheckboxInput
 
 import logging
 

owrx/source/hackrf.py

@@ -1,6 +1,6 @@
 from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
-from owrx.form import Input
+from owrx.form.input import Input
-from owrx.form.device import BiasTeeInput
+from owrx.form.input.device import BiasTeeInput
 from typing import List
 
 

owrx/source/perseussdr.py

@@ -1,6 +1,6 @@
 from owrx.source.direct import DirectSource, DirectSourceDeviceDescription
 from owrx.command import Option, Flag
-from owrx.form import Input, DropdownEnum, DropdownInput, CheckboxInput
+from owrx.form.input import Input, DropdownEnum, DropdownInput, CheckboxInput
 from typing import List
 
 

owrx/source/rtl_sdr.py

@@ -1,8 +1,8 @@
 from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription
 from owrx.command import Flag, Option
 from typing import List
-from owrx.form import Input, TextInput
+from owrx.form.input import Input, TextInput
-from owrx.form.device import BiasTeeInput, DirectSamplingInput
+from owrx.form.input.device import BiasTeeInput, DirectSamplingInput
 
 
 class RtlSdrSource(ConnectorSource):

owrx/source/rtl_sdr_soapy.py

@@ -1,6 +1,6 @@
 from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
-from owrx.form import Input
+from owrx.form.input import Input
-from owrx.form.device import BiasTeeInput, DirectSamplingInput
+from owrx.form.input.device import BiasTeeInput, DirectSamplingInput
 from typing import List
 
 

owrx/source/rtl_tcp.py

@@ -1,7 +1,7 @@
 from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription
 from owrx.command import Flag, Option, Argument
-from owrx.form import Input
+from owrx.form.input import Input
-from owrx.form.device import RemoteInput
+from owrx.form.input.device import RemoteInput
 from typing import List
 
 

owrx/source/runds.py

@@ -1,7 +1,7 @@
 from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription
 from owrx.command import Argument, Flag, Option
-from owrx.form import Input, DropdownInput, DropdownEnum, CheckboxInput
+from owrx.form.input import Input, DropdownInput, DropdownEnum, CheckboxInput
-from owrx.form.device import RemoteInput
+from owrx.form.input.device import RemoteInput
 from typing import List
 
 

owrx/source/sdrplay.py

@@ -1,6 +1,6 @@
 from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
-from owrx.form import Input, CheckboxInput, DropdownInput, DropdownEnum
+from owrx.form.input import Input, CheckboxInput, DropdownInput, DropdownEnum
-from owrx.form.device import BiasTeeInput
+from owrx.form.input.device import BiasTeeInput
 from typing import List
 
 

owrx/source/soapy.py

@@ -2,8 +2,8 @@ from abc import ABCMeta, abstractmethod
 from owrx.command import Option
 from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription
 from typing import List
-from owrx.form import Input, TextInput
+from owrx.form.input import Input, TextInput
-from owrx.form.device import GainInput
+from owrx.form.input.device import GainInput
 from owrx.soapy import SoapySettings
 
 

owrx/source/soapy_remote.py

@@ -1,6 +1,6 @@
 from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
-from owrx.form import Input, TextInput
+from owrx.form.input import Input, TextInput
-from owrx.form.device import RemoteInput
+from owrx.form.input.device import RemoteInput
 from typing import List
 
 

owrx/waterfall.py

@@ -1,4 +1,4 @@
-from owrx.form import DropdownEnum
+from owrx.form.input import DropdownEnum
 from owrx.config import Config
 
 

setup.py

@@ -21,6 +21,7 @@ setup(
             "owrx.controllers.settings",
             "owrx.property",
             "owrx.form",
+            "owrx.form.input",
             "owrx.config",
             "owrx.reporting",
             "owrx.audio",