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

run the code formatter over all

Browse Source
This commit is contained in:
Jakob Ketterl
2021-01-20 17:01:46 +01:00
parent f0dc2f8ebe
commit 64b7b485b3
37 changed files with 268 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
owrx/service/__init__.py
View File

@@ -137,9 +137,7 @@ class ServiceHandler(SdrSourceEventClient):
dials = [
dial
for dial in Bandplan.getSharedInstance().collectDialFrequencies(
frequency_range
)
for dial in Bandplan.getSharedInstance().collectDialFrequencies(frequency_range)
if self.isSupported(dial["mode"])
]
@@ -150,16 +148,12 @@ class ServiceHandler(SdrSourceEventClient):
groups = self.optimizeResampling(dials, sr)
if groups is None:
for dial in dials:
self.services.append(
self.setupService(dial["mode"], dial["frequency"], self.source)
)
self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
else:
for group in groups:
cf = self.get_center_frequency(group)
bw = self.get_bandwidth(group)
logger.debug(
"group center frequency: {0}, bandwidth: {1}".format(cf, bw)
)
logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw))
resampler_props = PropertyLayer()
resampler_props["center_freq"] = cf
resampler_props["samp_rate"] = bw
@@ -167,11 +161,7 @@ class ServiceHandler(SdrSourceEventClient):
resampler.start()
for dial in group:
self.services.append(
self.setupService(
dial["mode"], dial["frequency"], resampler
)
)
self.services.append(self.setupService(dial["mode"], dial["frequency"], resampler))
# resampler goes in after the services since it must not be shutdown as long as the services are still running
self.services.append(resampler)
@@ -238,9 +228,7 @@ class ServiceHandler(SdrSourceEventClient):
results = sorted(usages, key=lambda f: f["total_bandwidth"])
for r in results:
logger.debug(
"splits: {0}, total: {1}".format(r["num_splits"], r["total_bandwidth"])
)
logger.debug("splits: {0}, total: {1}".format(r["num_splits"], r["total_bandwidth"]))
best = results[0]
if best["num_splits"] is None:
@@ -267,7 +255,7 @@ class ServiceHandler(SdrSourceEventClient):
d.set_secondary_demodulator(mode)
d.set_audio_compression("none")
d.set_samp_rate(source.getProps()["samp_rate"])
d.set_temporary_directory(Config.get()['temporary_directory'])
d.set_temporary_directory(Config.get()["temporary_directory"])
d.set_service()
d.start()
return d