From 91c4d6f5681ffb7a987166b93adf9b980d7f84df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 25 Feb 2021 22:19:05 +0100
Subject: [PATCH] make scheduler respond to config changes

---
 owrx/service/__init__.py |  3 +--
 owrx/service/schedule.py | 23 ++++++++++++++++-------
 owrx/source/__init__.py  |  2 ++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index ecd4b6e..20b05ab 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -72,8 +72,7 @@ class ServiceHandler(SdrSourceEventClient):
         props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
         if self.source.isAvailable():
             self.scheduleServiceStartup()
-        if "schedule" in props or "scheduler" in props:
-            self.scheduler = ServiceScheduler(self.source)
+        self.scheduler = ServiceScheduler(self.source)
 
     def getClientClass(self) -> SdrClientClass:
         return SdrClientClass.INACTIVE
diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 6f9b5ad..53032ed 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -72,10 +72,7 @@ class DatetimeScheduleEntry(ScheduleEntry):
 class Schedule(ABC):
     @staticmethod
     def parse(props):
-        # downwards compatibility
-        if "schedule" in props:
-            return StaticSchedule(props["schedule"])
-        elif "scheduler" in props:
+        if "scheduler" in props:
             sc = props["scheduler"]
             t = sc["type"] if "type" in sc else "static"
             if t == "static":
@@ -84,6 +81,9 @@ class Schedule(ABC):
                 return DaylightSchedule(sc["schedule"])
             else:
                 logger.warning("Invalid scheduler type: %s", t)
+        # downwards compatibility
+        elif "schedule" in props:
+            return StaticSchedule(props["schedule"])
 
     @abstractmethod
     def getCurrentEntry(self):
@@ -209,10 +209,15 @@ class ServiceScheduler(SdrSourceEventClient):
     def __init__(self, source):
         self.source = source
         self.selectionTimer = None
-        self.source.addClient(self)
+        self.schedule = None
+        props = self.source.getProps()
+        props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
+        props.wireProperty("scheduler", self.parseSchedule)
+        self.parseSchedule()
+
+    def parseSchedule(self, *args):
         props = self.source.getProps()
         self.schedule = Schedule.parse(props)
-        props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
         self.scheduleSelection()
 
     def shutdown(self):
@@ -258,12 +263,16 @@ class ServiceScheduler(SdrSourceEventClient):
         entry = self.schedule.getCurrentEntry()
 
         if entry is None:
-            logger.debug("schedule did not return a profile. checking next entry...")
+            logger.debug("schedule did not return a current profile. releasing source...")
+            self.source.removeClient(self)
+            logger.debug("checking next (future) entry...")
             nextEntry = self.schedule.getNextEntry()
             if nextEntry is not None:
                 self.scheduleSelection(nextEntry.getNextActivation())
+            logger.debug("no next entry available, scheduler standing by for external events.")
             return
 
+        self.source.addClient(self)
         logger.debug("selected profile %s until %s", entry.getProfile(), entry.getScheduledEnd())
         self.scheduleSelection(entry.getScheduledEnd())
 
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index aa4cac3..078441e 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -303,6 +303,8 @@ class SdrSource(ABC):
         return len(clients) > 0
 
     def addClient(self, c: SdrSourceEventClient):
+        if c in self.clients:
+            return
         self.clients.append(c)
         c.onStateChange(self.getState())
         hasUsers = self.hasClients(SdrClientClass.USER)