From 99cd8e7baf3c253ec4f233911795f181b7daccd3 Mon Sep 17 00:00:00 2001 From: Marco Locatelli Date: Fri, 2 Apr 2021 18:12:40 +0200 Subject: [PATCH] fix order in json out + test x file list ordinata --- server/FTServer.py | 11 +++++++++++ server/templates/logger.html | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/server/FTServer.py b/server/FTServer.py index d608112..85bfe02 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -8,6 +8,8 @@ import os import json from werkzeug.utils import redirect import os.path, time +#from pathlib import Path +#from stat import S_ISREG, ST_CTIME, ST_MODE #assegno ipv4 statico ipv4 = '10.74.83.210' @@ -25,6 +27,7 @@ def getRedisVal(redisKey): return redSrv0.get(redisKey).decode('utf-8') flaskApp = Flask(__name__) +flaskApp.config['JSON_SORT_KEYS'] = False @flaskApp.route("/") #funzione main: passa al template home il titolo def main(): @@ -131,8 +134,16 @@ def api_channels_current(): def api_get_files(): dataDir='/home/pi/data/' fileList = os.listdir(dataDir) + # #all entries in the directory w/ stats + # data = (os.path.join(dataDir, fn) for fn in os.listdir(dataDir)) + # data = ((os.stat(path), path) for path in data) + # # regular files, insert creation date + # data = ((stat[ST_CTIME], path) + # for stat, path in data if S_ISREG(stat[ST_MODE])) + lista = [] idx=0 + # for item in sorted(data): for item in fileList: t_obj = time.strptime(time.ctime(os.path.getctime(dataDir+item))) # Transforming the time object to a timestamp diff --git a/server/templates/logger.html b/server/templates/logger.html index 3ea2287..9d11497 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -229,7 +229,6 @@
-