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

download dmr ids asynchronously

Browse Source
This commit is contained in:
Jakob Ketterl 2019-05-30 18:32:08 +02:00
parent 7100d43d9e
commit f565b4dbcd
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
owrx/meta.py
View File

@ -3,36 +3,44 @@ from urllib import request
import json import json
from datetime import datetime, timedelta from datetime import datetime, timedelta
import logging import logging
import threading
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class DmrMetaEnricher(object): class DmrMetaEnricher(object):
def __init__(self): def __init__(self):
self.cache = {} self.cache = {}
self.threads = {}
self.cacheTimeout = timedelta(seconds = 86400) self.cacheTimeout = timedelta(seconds = 86400)
def cacheEntryValid(self, id): def cacheEntryValid(self, id):
if not id in self.cache: return False if not id in self.cache: return False
entry = self.cache[id] entry = self.cache[id]
return entry["timestamp"] + self.cacheTimeout > datetime.now() return entry["timestamp"] + self.cacheTimeout > datetime.now()
def enrich(self, meta): def downloadRadioIdData(self, id):
if not PropertyManager.getSharedInstance()["digital_voice_dmr_id_lookup"]: return None
if not "source" in meta: return None
source = meta["source"]
if not self.cacheEntryValid(source):
try: try:
logger.debug("requesting DMR metadata for id=%s", source) logger.debug("requesting DMR metadata for id=%s", id)
res = request.urlopen("https://www.radioid.net/api/dmr/user/?id={0}".format(source), timeout=5).read() res = request.urlopen("https://www.radioid.net/api/dmr/user/?id={0}".format(id), timeout=5).read()
data = json.loads(res.decode("utf-8")) data = json.loads(res.decode("utf-8"))
self.cache[source] = { self.cache[id] = {
"timestamp": datetime.now(), "timestamp": datetime.now(),
"data": data "data": data
} }
except json.JSONDecodeError: except json.JSONDecodeError:
self.cache[source] = { self.cache[id] = {
"timestamp": datetime.now(), "timestamp": datetime.now(),
"data": None "data": None
} }
data = self.cache[source]["data"] del self.threads[id]
def enrich(self, meta):
if not PropertyManager.getSharedInstance()["digital_voice_dmr_id_lookup"]: return None
if not "source" in meta: return None
id = meta["source"]
if not self.cacheEntryValid(id):
if not id in self.threads:
self.threads[id] = threading.Thread(target=self.downloadRadioIdData, args=[id])
self.threads[id].start()
return None
data = self.cache[id]["data"]
if "count" in data and data["count"] > 0 and "results" in data: if "count" in data and data["count"] > 0 and "results" in data:
return data["results"][0] return data["results"][0]
return None return None