test files/comunication

App is now working (partly)

files/test.txt

@@ -0,0 +1 @@
+toto je test číslo 1

files/test2.txt

@@ -0,0 +1 @@
+toto je test n. 2

log.txt

@@ -0,0 +1,3 @@
+
+2021-03-10 12:20:52.490547 -> ERROR: heartbeat > list indices must be integers or slices, not str
+2021-03-10 12:29:03.690483 -> ERROR: heartbeat > list indices must be integers or slices, not str

main.py

@@ -1,9 +1,11 @@
 from fastapi import FastAPI, Request
+from fastapi.responses import FileResponse
 from pydantic import BaseModel
 import engine
 import requests
 import time
 import json
+import os
 import threading
 
 app = FastAPI()
@@ -14,12 +16,13 @@ sensors = {
     "počet ľudí": 10,
     "doba čakania": 2
 }
-log = engine.Log(print_m=True, debug=True)
+log = engine.Log(print_m=True, debug=False)
 
-time_to_heartbeat = 60 #Seconds
+time_to_heartbeat = 20  # Seconds
 location = "2"
 ID = 2
 IP = "192.168.1.99"
+
 filesystem = {
     "otvaracie_hod": ["t", {"pon": "10-25"}, {"uto": "10-25"}],
     "prehliadka": ["pdf", "/files/prehliadka.pdf"],
@@ -30,13 +33,15 @@ heartbeat_table = {
     "IP": ["192.168.1.231"],
     "location": ["1"],
     "file_system": ["x"],
-    "last_heartbeat": [7]
+    "last_heartbeat": [20]
 }
 heartbeat_table["ID"].append(ID)
 heartbeat_table["IP"].append(IP)
 heartbeat_table["location"].append(location)
 heartbeat_table["file_system"].append(filesystem)
 heartbeat_table["last_heartbeat"].append(time_to_heartbeat)
+
+
 # Todo better "host" ID handeling
 
 class Server_table(BaseModel):
@@ -59,7 +64,7 @@ def heartbeat(s_table: Server_table, request: Request):
                     heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] = s_table.last_heartbeat[
                         position]
                     log.debug(f"updated {server_id}`s heartbeat to {s_table.last_heartbeat[position]}")
-                    #Todo update filesystem too. Now updating only last heartbeat
+                    # Todo update filesystem too. Now updating only last heartbeat
             elif server_id == ID:
                 log.debug(f"Updated my heartbeat from {s_table.last_heartbeat[position]} to {time_to_heartbeat}")
                 heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(ID)] = time_to_heartbeat
@@ -81,15 +86,39 @@ def get_sensors(request: Request):
     return sensors
 
 
-@app.get("/files/{file}")
+@app.get("/files/{IDx}/{file}")
-def get_file(file: str):
+def get_file(IDx: int, file: str):
-    pass
+    if IDx == ID:
-    #Todo Get files function for client (phone/ther rpi)
+        return FileResponse(f"files/{file}")
+    elif IDx in heartbeat_table["ID"]:
+        r = requests.get(f"""http://{heartbeat_table["IP"][heartbeat_table["ID"].index(IDx)]}:8000/files/{IDx}/{file}""")
+        r.encoding = "utf-8"
+        if os.path.isdir(f"cache/{IDx}"):
+            if os.path.isfile(f"cache/{IDx}/{file}"):
+                pass
+                # Todo cache time to live/compare files on server and cache with not resource heavy function
+            else:
+                with open(f"cache/{IDx}/{file}", "wb") as save:
+                    save.write(bytes(r.content))
+        else:
+            os.mkdir(f"cache/{IDx}")
+            with open(f"cache/{IDx}/{file}", "wb") as save:
+                save.write(bytes(r.content))
+        return FileResponse(f"cache/{IDx}/{file}")
+    # Todo Get files function for client (phone/ther rpi)
 
 
+@app.post("/update")
+def update_sensors():
+    pass
+    # Todo Make option to upload "live data" manually to rpi
+
 def send_heartbeat(ip):
+    global heartbeat_table
     log.message(f"requesting heartbeat from {ip}")
     cache_request = requests.post(f"http://{ip}:8000/heartbeat", data=json.dumps(heartbeat_table))
+    heartbeat_table = dict(cache_request.json()[0])
+    #Todo test heartbeat table update
     log.debug(json.dumps(cache_request.json(), indent=4))
 
 
@@ -99,10 +128,11 @@ def mainloop():
             if device_ID != ID:
                 if heartbeat_table["last_heartbeat"][device_number] < 0:
                     send_heartbeat(heartbeat_table["IP"][device_number])
-                    heartbeat_table["last_heartbeat"][device_number] = time_to_heartbeat + 5
+                    heartbeat_table["last_heartbeat"][int(device_number)] = int(time_to_heartbeat) + 5
-                print(f"""{device_ID} : time to heartbeat : {heartbeat_table["last_heartbeat"][device_number]}""")
+                log.debug(f"""{device_ID} : time to heartbeat : {heartbeat_table["last_heartbeat"][device_number]}""")
                 heartbeat_table["last_heartbeat"][device_number] -= 1
         time.sleep(1)
 
+
 thread_1 = threading.Thread(target=mainloop, daemon=True)
 thread_1.start()