split config and property code, first test

This commit is contained in:
Jakob Ketterl
2020-03-21 22:40:39 +01:00
parent 7948b7bfa1
commit 541c38151f
24 changed files with 210 additions and 193 deletions

View File

@ -5,7 +5,7 @@ import random
import socket
from functools import reduce
from operator import and_
from owrx.config import PropertyManager
from owrx.config import Config
from owrx.version import openwebrx_version
from owrx.locator import Locator
from owrx.metrics import Metrics, CounterMetric
@ -36,7 +36,7 @@ class PskReporter(object):
def getSharedInstance():
with PskReporter.creationLock:
if PskReporter.sharedInstance is None:
if PropertyManager.getSharedInstance()["pskreporter_enabled"]:
if Config.get()["pskreporter_enabled"]:
PskReporter.sharedInstance = PskReporter()
else:
PskReporter.sharedInstance = PskReporterDummy()
@ -181,7 +181,7 @@ class Uploader(object):
)
def getReceiverInformation(self):
pm = PropertyManager.getSharedInstance()
pm = Config.get()
callsign = pm["pskreporter_callsign"]
locator = Locator.fromCoordinates(pm["receiver_gps"])
decodingSoftware = "OpenWebRX " + openwebrx_version