BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-04-05 14:25:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

threads and a few fixes to wildcards

Browse source
This commit is contained in:
Jan Speller 2020-02-24 21:51:19 +01:00
parent 0dbd01b3f9
commit 4b0614c7da
6 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
module/geocoding.py
View file

@ -46,10 +46,18 @@ class BoswatchModule(ModuleBase):
@param bwPacket: A BOSWatch packet instance"""
try:
address = re.search(self.config.get("regex"), bwPacket.get("message"))[1]
addressArray = re.search(self.config.get("regex"), bwPacket.get("message"))
provider = self.config.get("apiProvider")
if addressArray[1] is None:
logging.warning("Address was not found in current Message, skipping geocoding")
return bwPacket
address = addressArray[1]
bwPacket.set("address", address)
self.registerWildcard("{ADDRESS}", "address")
logging.info("Found address: '" + address + "' in packet")
if "mapbox" == provider:
logging.info("Using Mapbox as provider")
g = geocoder.mapbox(address, key=self.config.get("apiToken"))
@ -63,9 +71,10 @@ class BoswatchModule(ModuleBase):
logging.info("Found following coordinates for address: [lat=" + str(lat) + ", lon=" + str(lon) + "]")
bwPacket.set("lat", lat)
bwPacket.set("lon", lon)
self.registerWildcard("{LAT}", "lat")
self.registerWildcard("{LON}", "lon")
return bwPacket
except (IndexError, TypeError, ValueError):
logging.warning("Address was not found in current Message, skipping geocoding")
except Exception as e:
logging.error("Unknown Error while executing geocoding module: " + str(type(e).__name__) + ": " + str(e))
return bwPacket