From 35dcff90eacc9af3e2549f2e53178068b7f487e3 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Thu, 29 Apr 2021 15:17:21 +0200 Subject: [PATCH] refactor owrx.form -> owrx.form.input --- owrx/controllers/settings/backgrounddecoding.py | 2 +- owrx/controllers/settings/decoding.py | 6 +++--- owrx/controllers/settings/general.py | 10 +++++----- owrx/controllers/settings/reporting.py | 6 +++--- owrx/controllers/settings/sdr.py | 4 ++-- owrx/form/{ => input}/__init__.py | 4 ++-- owrx/form/{ => input}/aprs.py | 2 +- owrx/form/{ => input}/converter.py | 0 owrx/form/{ => input}/device.py | 2 +- owrx/form/{ => input}/gfx.py | 2 +- owrx/form/{ => input}/receiverid.py | 2 +- owrx/form/{ => input}/validator.py | 0 owrx/form/{ => input}/wfm.py | 2 +- owrx/form/{ => input}/wsjt.py | 4 ++-- owrx/source/__init__.py | 8 ++++---- owrx/source/airspy.py | 4 ++-- owrx/source/connector.py | 2 +- owrx/source/hackrf.py | 4 ++-- owrx/source/perseussdr.py | 2 +- owrx/source/rtl_sdr.py | 4 ++-- owrx/source/rtl_sdr_soapy.py | 4 ++-- owrx/source/rtl_tcp.py | 4 ++-- owrx/source/runds.py | 4 ++-- owrx/source/sdrplay.py | 4 ++-- owrx/source/soapy.py | 4 ++-- owrx/source/soapy_remote.py | 4 ++-- owrx/waterfall.py | 2 +- setup.py | 1 + 28 files changed, 49 insertions(+), 48 deletions(-) rename owrx/form/{ => input}/__init__.py (98%) rename owrx/form/{ => input}/aprs.py (96%) rename owrx/form/{ => input}/converter.py (100%) rename owrx/form/{ => input}/device.py (99%) rename owrx/form/{ => input}/gfx.py (97%) rename owrx/form/{ => input}/receiverid.py (85%) rename owrx/form/{ => input}/validator.py (100%) rename owrx/form/{ => input}/wfm.py (91%) rename owrx/form/{ => input}/wsjt.py (97%) diff --git a/owrx/controllers/settings/backgrounddecoding.py b/owrx/controllers/settings/backgrounddecoding.py index 8d18268..c2dd332 100644 --- a/owrx/controllers/settings/backgrounddecoding.py +++ b/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 diff --git a/owrx/controllers/settings/decoding.py b/owrx/controllers/settings/decoding.py index 8e00ed2..be035ab 100644 --- a/owrx/controllers/settings/decoding.py +++ b/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.wfm import WfmTauValues -from owrx.form.wsjt import Q65ModeMatrix, WsjtDecodingDepthsInput +from owrx.form.input import CheckboxInput, NumberInput, DropdownInput, Js8ProfileCheckboxInput, MultiCheckboxInput, Option +from owrx.form.input.wfm import WfmTauValues +from owrx.form.input.wsjt import Q65ModeMatrix, WsjtDecodingDepthsInput from owrx.wsjt import Fst4Profile, Fst4wProfile from owrx.breadcrumb import Breadcrumb, BreadcrumbItem diff --git a/owrx/controllers/settings/general.py b/owrx/controllers/settings/general.py index 43b8e28..3dc17c1 100644 --- a/owrx/controllers/settings/general.py +++ b/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.receiverid import ReceiverKeysConverter -from owrx.form.gfx import AvatarInput, TopPhotoInput -from owrx.form.device import WaterfallLevelsInput, WaterfallAutoLevelsInput +from owrx.form.input.converter import WaterfallColorsConverter, IntConverter +from owrx.form.input.receiverid import ReceiverKeysConverter +from owrx.form.input.gfx import AvatarInput, TopPhotoInput +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 diff --git a/owrx/controllers/settings/reporting.py b/owrx/controllers/settings/reporting.py index 7830ecf..1db2974 100644 --- a/owrx/controllers/settings/reporting.py +++ b/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.aprs import AprsBeaconSymbols, AprsAntennaDirections -from owrx.form import TextInput, CheckboxInput, DropdownInput, NumberInput +from owrx.form.input.converter import OptionalConverter +from owrx.form.input.aprs import AprsBeaconSymbols, AprsAntennaDirections +from owrx.form.input import TextInput, CheckboxInput, DropdownInput, NumberInput from owrx.breadcrumb import Breadcrumb, BreadcrumbItem diff --git a/owrx/controllers/settings/sdr.py b/owrx/controllers/settings/sdr.py index 7ad575a..68f591d 100644 --- a/owrx/controllers/settings/sdr.py +++ b/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.validator import RequiredValidator +from owrx.form.input import TextInput, DropdownInput, Option +from owrx.form.input.validator import RequiredValidator from owrx.property import PropertyLayer from owrx.breadcrumb import BreadcrumbMixin, Breadcrumb, BreadcrumbItem from abc import ABCMeta, abstractmethod diff --git a/owrx/form/__init__.py b/owrx/form/input/__init__.py similarity index 98% rename from owrx/form/__init__.py rename to owrx/form/input/__init__.py index 6e1e7d4..840985a 100644 --- a/owrx/form/__init__.py +++ b/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.converter import Converter, NullConverter, IntConverter, FloatConverter, EnumConverter +from owrx.form.input.validator import Validator +from owrx.form.input.converter import Converter, NullConverter, IntConverter, FloatConverter, EnumConverter from enum import Enum diff --git a/owrx/form/aprs.py b/owrx/form/input/aprs.py similarity index 96% rename from owrx/form/aprs.py rename to owrx/form/input/aprs.py index e56b019..a81eab7 100644 --- a/owrx/form/aprs.py +++ b/owrx/form/input/aprs.py @@ -1,4 +1,4 @@ -from owrx.form import DropdownEnum +from owrx.form.input import DropdownEnum class AprsBeaconSymbols(DropdownEnum): diff --git a/owrx/form/converter.py b/owrx/form/input/converter.py similarity index 100% rename from owrx/form/converter.py rename to owrx/form/input/converter.py diff --git a/owrx/form/device.py b/owrx/form/input/device.py similarity index 99% rename from owrx/form/device.py rename to owrx/form/input/device.py index 68d3d45..358886f 100644 --- a/owrx/form/device.py +++ b/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_ diff --git a/owrx/form/gfx.py b/owrx/form/input/gfx.py similarity index 97% rename from owrx/form/gfx.py rename to owrx/form/input/gfx.py index 09d63b0..eb9f181 100644 --- a/owrx/form/gfx.py +++ b/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 diff --git a/owrx/form/receiverid.py b/owrx/form/input/receiverid.py similarity index 85% rename from owrx/form/receiverid.py rename to owrx/form/input/receiverid.py index 28b7266..0812cc6 100644 --- a/owrx/form/receiverid.py +++ b/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): diff --git a/owrx/form/validator.py b/owrx/form/input/validator.py similarity index 100% rename from owrx/form/validator.py rename to owrx/form/input/validator.py diff --git a/owrx/form/wfm.py b/owrx/form/input/wfm.py similarity index 91% rename from owrx/form/wfm.py rename to owrx/form/input/wfm.py index 1bdb7d7..544754b 100644 --- a/owrx/form/wfm.py +++ b/owrx/form/input/wfm.py @@ -1,4 +1,4 @@ -from owrx.form import DropdownEnum +from owrx.form.input import DropdownEnum class WfmTauValues(DropdownEnum): diff --git a/owrx/form/wsjt.py b/owrx/form/input/wsjt.py similarity index 97% rename from owrx/form/wsjt.py rename to owrx/form/input/wsjt.py index 3dcaf91..1410599 100644 --- a/owrx/form/wsjt.py +++ b/owrx/form/input/wsjt.py @@ -1,5 +1,5 @@ -from owrx.form import Input -from owrx.form.converter import JsonConverter +from owrx.form.input import Input +from owrx.form.input.converter import JsonConverter from owrx.wsjt import Q65Mode, Q65Interval from owrx.modes import Modes, WsjtMode import html diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py index d379ddc..e5801be 100644 --- a/owrx/source/__init__.py +++ b/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.converter import OptionalConverter -from owrx.form.device import GainInput, SchedulerInput, WaterfallLevelsInput -from owrx.form.validator import RequiredValidator +from owrx.form.input import Input, TextInput, NumberInput, CheckboxInput, ModesInput, ExponentialInput +from owrx.form.input.converter import OptionalConverter +from owrx.form.input.device import GainInput, SchedulerInput, WaterfallLevelsInput +from owrx.form.input.validator import RequiredValidator from owrx.controllers.settings import Section from owrx.feature import FeatureDetector from typing import List diff --git a/owrx/source/airspy.py b/owrx/source/airspy.py index 0ee349d..53e7f13 100644 --- a/owrx/source/airspy.py +++ b/owrx/source/airspy.py @@ -1,6 +1,6 @@ from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription -from owrx.form import Input, CheckboxInput -from owrx.form.device import BiasTeeInput +from owrx.form.input import Input, CheckboxInput +from owrx.form.input.device import BiasTeeInput from typing import List diff --git a/owrx/source/connector.py b/owrx/source/connector.py index 67b91df..6c9a467 100644 --- a/owrx/source/connector.py +++ b/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 diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py index 59d2499..bd16a3d 100644 --- a/owrx/source/hackrf.py +++ b/owrx/source/hackrf.py @@ -1,6 +1,6 @@ from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription -from owrx.form import Input -from owrx.form.device import BiasTeeInput +from owrx.form.input import Input +from owrx.form.input.device import BiasTeeInput from typing import List diff --git a/owrx/source/perseussdr.py b/owrx/source/perseussdr.py index 2b961fa..ff5b0c5 100644 --- a/owrx/source/perseussdr.py +++ b/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 diff --git a/owrx/source/rtl_sdr.py b/owrx/source/rtl_sdr.py index fc6a2d0..cb9e954 100644 --- a/owrx/source/rtl_sdr.py +++ b/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.device import BiasTeeInput, DirectSamplingInput +from owrx.form.input import Input, TextInput +from owrx.form.input.device import BiasTeeInput, DirectSamplingInput class RtlSdrSource(ConnectorSource): diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py index 0908c5e..a308c7d 100644 --- a/owrx/source/rtl_sdr_soapy.py +++ b/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.device import BiasTeeInput, DirectSamplingInput +from owrx.form.input import Input +from owrx.form.input.device import BiasTeeInput, DirectSamplingInput from typing import List diff --git a/owrx/source/rtl_tcp.py b/owrx/source/rtl_tcp.py index fe65181..6c3f7d2 100644 --- a/owrx/source/rtl_tcp.py +++ b/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.device import RemoteInput +from owrx.form.input import Input +from owrx.form.input.device import RemoteInput from typing import List diff --git a/owrx/source/runds.py b/owrx/source/runds.py index cd3f342..9d4e9b9 100644 --- a/owrx/source/runds.py +++ b/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.device import RemoteInput +from owrx.form.input import Input, DropdownInput, DropdownEnum, CheckboxInput +from owrx.form.input.device import RemoteInput from typing import List diff --git a/owrx/source/sdrplay.py b/owrx/source/sdrplay.py index 25745f3..454e472 100644 --- a/owrx/source/sdrplay.py +++ b/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.device import BiasTeeInput +from owrx.form.input import Input, CheckboxInput, DropdownInput, DropdownEnum +from owrx.form.input.device import BiasTeeInput from typing import List diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py index 796555f..745343c 100644 --- a/owrx/source/soapy.py +++ b/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.device import GainInput +from owrx.form.input import Input, TextInput +from owrx.form.input.device import GainInput from owrx.soapy import SoapySettings diff --git a/owrx/source/soapy_remote.py b/owrx/source/soapy_remote.py index bc507a2..b3077e6 100644 --- a/owrx/source/soapy_remote.py +++ b/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.device import RemoteInput +from owrx.form.input import Input, TextInput +from owrx.form.input.device import RemoteInput from typing import List diff --git a/owrx/waterfall.py b/owrx/waterfall.py index ad1a31e..c88231a 100644 --- a/owrx/waterfall.py +++ b/owrx/waterfall.py @@ -1,4 +1,4 @@ -from owrx.form import DropdownEnum +from owrx.form.input import DropdownEnum from owrx.config import Config diff --git a/setup.py b/setup.py index 4315a25..9c11425 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ setup( "owrx.controllers.settings", "owrx.property", "owrx.form", + "owrx.form.input", "owrx.config", "owrx.reporting", "owrx.audio",