refactor the sdr.hu updater into the new server, too

owrx/config.py

@@ -53,6 +53,9 @@ class PropertyManager(object):
         prop.wire(fireCallbacks)
         return self
 
+    def __contains__(self, name):
+        return self.hasProperty(name)
+
     def __getitem__(self, name):
         return self.getPropertyValue(name)
 
@@ -61,6 +64,9 @@ class PropertyManager(object):
             self.add(name, Property())
         self.getProperty(name).setValue(value)
 
+    def __dict__(self):
+        return {k:v.getValue() for k, v in self.properties.items()}
+
     def hasProperty(self, name):
         return name in self.properties
 
@@ -86,6 +92,15 @@ class PropertyManager(object):
                 p.setValue(other_pm[key])
         return self
 
+    def loadConfig(self, filename):
+        cfg = __import__(filename)
+        for name, value in cfg.__dict__.items():
+            if name.startswith("__"):
+                continue
+            self[name] = value
+        return self
+
+
 class UnknownFeatureException(Exception):
     pass
 

owrx/sdrhu.py

@@ -0,0 +1,36 @@
+import threading
+import subprocess
+import time
+from owrx.config import PropertyManager
+
+import logging
+logger = logging.getLogger(__name__)
+
+
+class SdrHuUpdater(threading.Thread):
+    def __init__(self):
+        self.doRun = True
+        super().__init__()
+
+    def update(self):
+        pm = PropertyManager.getSharedInstance()
+        cmd = "wget --timeout=15 -4qO- https://sdr.hu/update --post-data \"url=http://{server_hostname}:{web_port}&apikey={sdrhu_key}\" 2>&1".format(**pm.__dict__())
+        logger.debug(cmd)
+        returned=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).communicate()
+        returned=returned[0].decode('utf-8')
+        if "UPDATE:" in returned:
+            retrytime_mins = 20
+            value=returned.split("UPDATE:")[1].split("\n",1)[0]
+            if value.startswith("SUCCESS"):
+                logger.info("Update succeeded!")
+            else:
+                logger.warning("Update failed, your receiver cannot be listed on sdr.hu! Reason: %s", value)
+        else:
+            retrytime_mins = 2
+            logger.warning("wget failed while updating, your receiver cannot be listed on sdr.hu!")
+        return retrytime_mins
+
+    def run(self):
+        while self.doRun:
+            retrytime_mins = self.update()
+            time.sleep(60*retrytime_mins)