Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-20 23:30:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

use helper function for date and time

Browse source
This commit is contained in:
Schrolli 2015-07-01 14:27:22 +02:00
parent 2778b9e710
commit 71070932db
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/config.template.ini
View file

@ -127,13 +127,15 @@ tablePOC = bos_pocsag
# %DIRT% = Direction of the telegram (Text-String)
# %TSI% = Tactical Short Information (I-IV)
# %DESCR% = Description from csv-file
# %TIME% = Date/Time (by script)
# %TIME% = Time (by script)
# %DATE% = DATE (by script)
#fms_url = www.google.de?code=%FMS%&stat=%STATUS%
fms_url =
# %ZVEI% = ZVEI 5-tone Code
# %DESCR% = Description from csv-file
# %TIME% = Date/Time (by script)
# %TIME% = Time (by script)
# %DATE% = DATE (by script)
#zvei_url = www.google.de?zvei=%ZVEI%
zvei_url =
@ -143,7 +145,8 @@ zvei_url =
# %MSG% = Message of the Pocsag telegram
# %BITRATE% = Bitrate of the Pocsag telegram
# %DESCR% = Description from csv-file
# %TIME% = Date/Time (by script)
# %TIME% = Time (by script)
# %DATE% = DATE (by script)
#poc_url = www.google.de?ric=%RIC%&subric=%FUNC%&msg=%MSG%
poc_url =

20
plugins/httpRequest/httpRequest.py
View file

@ -15,6 +15,7 @@ import httplib #for the HTTP request
from urlparse import urlparse #for split the URL into url and path
from includes import globals # Global variables
from includes import helper #Global helper functions
##
#
@ -32,13 +33,6 @@ def onLoad():
"""
# nothing to do for this plugin
return
##
#
# Private helper function for a printable Timestamp
#
def curtime():
return time.strftime("%Y-%m-%d %H:%M:%S")
##
@ -86,22 +80,22 @@ def run(typ,freq,data):
url = url.replace("%FMS%", data["fms"]).replace("%STATUS%", data["status"]) #replace Wildcards
url = url.replace("%DIR%", data["direction"]).replace("%DIRT%", data["directionText"]) #replace Wildcards
url = url.replace("%TSI%", data["tsi"]) #replace Wildcards
url = url.replace("%DESCR%", data["description"]) # replace Wildcards
url = url.replace("%TIME%", curtime()) # replace Wildcards
elif typ == "ZVEI":
url = globals.config.get("httpRequest", "zvei_url") #Get URL
url = url.replace("%ZVEI%", data["zvei"]) #replace Wildcards
url = url.replace("%DESCR%", data["description"]) # replace Wildcards
url = url.replace("%TIME%", curtime()) # replace Wildcards
elif typ == "POC":
url = globals.config.get("httpRequest", "poc_url") #Get URL
url = url.replace("%RIC%", data["ric"]) #replace Wildcards
url = url.replace("%FUNC%", data["function"]).replace("%FUNCCHAR%", data["functionChar"]) #replace Wildcards
url = url.replace("%MSG%", data["msg"]).replace("%BITRATE%", str(data["bitrate"])) #replace Wildcards
url = url.replace("%DESCR%", data["description"]) # replace Wildcards
url = url.replace("%TIME%", curtime()) # replace Wildcards
else:
logging.warning("Invalid Typ: %s", typ)
raise
#same in all types
url = url.replace("%DESCR%", data["description"]) # replace Wildcards
url = url.replace("%TIME%", helper.curtime("%H:%M:%S")) # replace Wildcards
url = url.replace("%DATE%", helper.curtime("%d.%m.%Y")) # replace Wildcards
#
# HTTP-Request