diff --git a/owrx/audio.py b/owrx/audio.py index 4e81f06..0b1cbc4 100644 --- a/owrx/audio.py +++ b/owrx/audio.py @@ -13,7 +13,7 @@ from queue import Queue, Full import logging logger = logging.getLogger(__name__) -#logger.setLevel(logging.INFO) +logger.setLevel(logging.INFO) class QueueJob(object): @@ -132,7 +132,7 @@ class AudioWriter(object): def getWaveFile(self): filename = "{tmp_dir}/openwebrx-audiochopper-{id}-{timestamp}.wav".format( tmp_dir=self.tmp_dir, - id=id(self.profile), + id=id(self), timestamp=datetime.utcnow().strftime(self.profile.getFileTimestampFormat()), ) wavefile = wave.open(filename, "wb") diff --git a/owrx/js8.py b/owrx/js8.py index 5611f07..80b69ea 100644 --- a/owrx/js8.py +++ b/owrx/js8.py @@ -6,16 +6,14 @@ from js8py.frames import Js8FrameHeartbeat, Js8FrameCompound from owrx.map import Map, LocatorLocation from owrx.pskreporter import PskReporter from owrx.metrics import Metrics, CounterMetric +from abc import ABCMeta import logging logger = logging.getLogger(__name__) -class Js8NormalProfile(AudioChopperProfile): - def getInterval(self): - return 15 - +class Js8Profile(AudioChopperProfile, metaclass=ABCMeta): def getFileTimestampFormat(self): return "%y%m%d_%H%M%S" @@ -23,6 +21,16 @@ class Js8NormalProfile(AudioChopperProfile): return ["js8", "--js8", "-d", str(self.decoding_depth("js8")), file] +class Js8NormalProfile(Js8Profile): + def getInterval(self): + return 15 + + +class Js8SlowProfile(Js8Profile): + def getInterval(self): + return 30 + + class Js8Parser(Parser): decoderRegex = re.compile(" ?")