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

Merge branch 'develop' into csdr++

Browse Source
This commit is contained in:
Jakob Ketterl 2021-06-28 15:14:24 +02:00
commit 566b747928
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
owrx/meta.py
View File

@ -59,16 +59,26 @@ class RadioIDEnricher(Enricher):
self.mode = mode self.mode = mode
self.threads = {} self.threads = {}
def downloadRadioIdData(self, id): def _fillCache(self, id):
cache = RadioIDCache.getSharedInstance() RadioIDCache.getSharedInstance().put(self.mode, id, self._downloadRadioIdData(id))
del self.threads[id]
def _downloadRadioIdData(self, id):
try: try:
logger.debug("requesting radioid metadata for mode=%s and id=%s", self.mode, id) logger.debug("requesting radioid metadata for mode=%s and id=%s", self.mode, id)
res = request.urlopen("https://www.radioid.net/api/{0}/user/?id={1}".format(self.mode, id), timeout=30).read() res = request.urlopen("https://www.radioid.net/api/{0}/user/?id={1}".format(self.mode, id), timeout=30)
data = json.loads(res.decode("utf-8")) if res.status != 200:
cache.put(self.mode, id, data) logger.warning("radioid API returned error %i for mode=%s and id=%s", res.status, self.mode, id)
return None
data = json.loads(res.read().decode("utf-8"))
if "count" in data and data["count"] > 0 and "results" in data:
for item in data["results"]:
if "id" in item and item["id"] == id:
return item
except json.JSONDecodeError: except json.JSONDecodeError:
cache.put(self.mode, id, None) logger.warning("unable to parse radioid response JSON")
del self.threads[id]
return None
def enrich(self, meta): def enrich(self, meta):
config_key = "digital_voice_{}_id_lookup".format(self.mode) config_key = "digital_voice_{}_id_lookup".format(self.mode)
@ -76,16 +86,16 @@ class RadioIDEnricher(Enricher):
return meta return meta
if "source" not in meta: if "source" not in meta:
return meta return meta
id = meta["source"] id = int(meta["source"])
cache = RadioIDCache.getSharedInstance() cache = RadioIDCache.getSharedInstance()
if not cache.isValid(self.mode, id): if not cache.isValid(self.mode, id):
if id not in self.threads: if id not in self.threads:
self.threads[id] = threading.Thread(target=self.downloadRadioIdData, args=[id], daemon=True) self.threads[id] = threading.Thread(target=self._fillCache, args=[id], daemon=True)
self.threads[id].start() self.threads[id].start()
return meta return meta
data = cache.get(self.mode, id) data = cache.get(self.mode, id)
if data is not None and "count" in data and data["count"] > 0 and "results" in data: if data is not None:
meta["additional"] = data["results"][0] meta["additional"] = data
return meta return meta