Drop function for reading dw logs directly.
This commit is contained in:
parent
50e8324786
commit
78641d0eef
29
api_app.py
29
api_app.py
|
@ -21,34 +21,6 @@ def read_config():
|
||||||
config.read('config.ini')
|
config.read('config.ini')
|
||||||
return config
|
return config
|
||||||
|
|
||||||
def read_logs(log_folder):
|
|
||||||
# Read some log files
|
|
||||||
# UTC time, so let's look at tomorrow, today, and yesterday.
|
|
||||||
today = date.today()
|
|
||||||
yesterday = today - timedelta(days = 1)
|
|
||||||
tomorrow = today + timedelta(days = 1)
|
|
||||||
file_list = glob.glob(log_folder+str(yesterday)+"*") + \
|
|
||||||
glob.glob(log_folder+str(today)+"*") + \
|
|
||||||
glob.glob(log_folder+str(tomorrow)+"*")
|
|
||||||
|
|
||||||
# https://stackoverflow.com/a/66071962
|
|
||||||
json_array = []
|
|
||||||
for file in file_list:
|
|
||||||
with open(file, encoding='utf-8') as csvf:
|
|
||||||
csvReader = csv.DictReader(csvf)
|
|
||||||
for row in csvReader:
|
|
||||||
#add this python dict to json array
|
|
||||||
json_array.append(row)
|
|
||||||
|
|
||||||
# Add the call and location of this station to the packet info
|
|
||||||
config = read_config()
|
|
||||||
for item in json_array:
|
|
||||||
item['station_name'] = config['Settings']['station_call']
|
|
||||||
item['station_lat'] = config['Settings']['station_lat']
|
|
||||||
item['station_lon'] = config['Settings']['station_lon']
|
|
||||||
|
|
||||||
return(json_array)
|
|
||||||
|
|
||||||
def dict_factory(cursor, row):
|
def dict_factory(cursor, row):
|
||||||
d = {}
|
d = {}
|
||||||
for idx, col in enumerate(cursor.description):
|
for idx, col in enumerate(cursor.description):
|
||||||
|
@ -136,6 +108,7 @@ def index():
|
||||||
station['last_heard'] = datetime.datetime.utcfromtimestamp(station['last_heard_unix'])
|
station['last_heard'] = datetime.datetime.utcfromtimestamp(station['last_heard_unix'])
|
||||||
station['time_ago'] = timeago.format(station['last_heard_unix'], datetime.datetime.now())
|
station['time_ago'] = timeago.format(station['last_heard_unix'], datetime.datetime.now())
|
||||||
|
|
||||||
|
|
||||||
return render_template('index.html',
|
return render_template('index.html',
|
||||||
station_call = config['Settings']['station_call'],
|
station_call = config['Settings']['station_call'],
|
||||||
station_lat = config['Settings']['station_lat'],
|
station_lat = config['Settings']['station_lat'],
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
[Settings]
|
[Settings]
|
||||||
# Path to direwolf log folder, include trailing slash
|
|
||||||
log_folder = logs/
|
|
||||||
#log_folder = /home/pi/logs/direwolf/
|
|
||||||
|
|
||||||
# Name and location of this station, for inclusion in the API
|
# Name and location of this station, for inclusion in the API
|
||||||
station_call = W1CDN-1
|
station_call = W1CDN-1
|
||||||
station_lat = 47.941500
|
station_lat = 47.941500
|
||||||
|
|
Loading…
Reference in New Issue
Block a user